From: Andre Noll <maan@systemlinux.org>
Date: Sat, 11 Jul 2009 19:01:40 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~51^2~2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=92339599bddb1b1b79b6aa76d645b403081f4835;p=paraslash.git

Merge branch 'master' into next
---

92339599bddb1b1b79b6aa76d645b403081f4835
diff --cc afs.c
index 531cada8,ccda7cda..1350db34
--- a/afs.c
+++ b/afs.c
@@@ -1019,15 -1089,14 +1020,14 @@@ static void create_tables_callback(int 
  	}
  	ret = open_afs_tables();
  out:
- 	if (ret >= 0)
- 		buf = make_message("successfully created afs table(s)\n");
- 	else
- 		buf = make_message("%s\n", para_strerror(-ret));
- 	pass_buffer_as_shm(buf, strlen(buf), &fd);
- 	free(buf);
+ 	if (ret < 0)
+ 		para_printf(&pb, "%s\n", para_strerror(-ret));
+ 	if (pb.buf)
+ 		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ 	free(pb.buf);
  }
  
 -int com_init(int fd, int argc, char * const * const argv)
 +int com_init(struct rc4_context *rc4c, int argc, char * const * const argv)
  {
  	int i, j, ret;
  	uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;