Rev 592: merge from volker in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 592
revision-id: tridge at samba.org-20070822071601-gkr2z4fx47k3begz
parent: tridge at samba.org-20070820011338-ppqfbix9v5j5ll3o
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Wed 2007-08-22 17:16:01 +1000
message:
  merge from volker
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  tests/rb_test.c                rb_test.c-20070808012115-zxl6646v2t2axezt-1
  utils/smnotify/smnotify.c      smnotify.c-20070803001844-k0ekeu031hzlt8bg-3
=== modified file 'Makefile.in'
--- a/Makefile.in	2007-08-15 05:01:31 +0000
+++ b/Makefile.in	2007-08-22 07:16:01 +0000
@@ -135,6 +135,7 @@
 
 clean:
 	rm -f *.o */*.o */*/*.o */*~
+	rm -f utils/smnotify/gen_xdr.c
 	rm -f $(BINS) $(SBINS) $(TEST_BINS)
 
 distclean: clean

=== modified file 'tests/rb_test.c'
--- a/tests/rb_test.c	2007-08-15 00:57:21 +0000
+++ b/tests/rb_test.c	2007-08-22 07:16:01 +0000
@@ -134,7 +134,7 @@
 
 	printf("testing trbt_insert32_callback for %d records\n", num_records);
 	memctx   = talloc_new(NULL);
-	u32array = talloc_array(memctx, uint32_t, num_records);
+	u32array = talloc_array(memctx, uint32_t *, num_records);
 	tree = trbt_create(memctx, 0);
 	for (i=0; i<num_records; i++) {
 		u32array[i]  = talloc(u32array, uint32_t);
@@ -175,7 +175,7 @@
 	printf("testing trbt_insertarray32_callback\n");
 	memctx   = talloc_new(NULL);
 	tree = trbt_create(memctx, 0);
-	u32array = talloc_array(memctx, uint32_t, 4);
+	u32array = talloc_array(memctx, uint32_t *, 4);
 	for (i=0;i<4;i++) {
 		u32array[i]  = talloc(u32array, uint32_t);
 		*u32array[i] = 0;

=== modified file 'utils/smnotify/smnotify.c'
--- a/utils/smnotify/smnotify.c	2007-08-03 00:47:37 +0000
+++ b/utils/smnotify/smnotify.c	2007-08-22 07:16:01 +0000
@@ -28,7 +28,7 @@
 
 static char *client       = NULL;
 static const char *ip     = NULL;
-static const char *server = NULL;
+static char *server = NULL;
 static int stateval       = 0;
 static int clientport     = 0;
 static int sendport       = 0;