merge from volker

(This used to be ctdb commit 7007e4f2292aa96287b899d6b9e82c7b597ef58f)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index d5bfe85899259944e7f1618ad470746dd78f175e..7499b0d7ff21fb9eb8d30f10632b30e6995cf700 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -135,6 +135,7 @@ doc: doc/ctdb.1 doc/ctdb.1.html \
 
 clean:
        rm -f *.o */*.o */*/*.o */*~
+       rm -f utils/smnotify/gen_xdr.c
        rm -f $(BINS) $(SBINS) $(TEST_BINS)
 
 distclean: clean

diff --git a/ctdb/tests/rb_test.c b/ctdb/tests/rb_test.c
index e057033172cf0d859ce64ba1cc1f2eb4c111095a..536b31c6d64397cac0dec60c52153c410093ef79 100644 (file)
--- a/ctdb/tests/rb_test.c
+++ b/ctdb/tests/rb_test.c
@@ -134,7 +134,7 @@ int main(int argc, const char *argv[])
 
        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 @@ int main(int argc, const char *argv[])
        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;

diff --git a/ctdb/utils/smnotify/smnotify.c b/ctdb/utils/smnotify/smnotify.c
index b93ce38776df535d50a1f79bea1ed63718222176..3f0058c6187bb2e70302cfa7ad99676944d7c65c 100644 (file)
--- a/ctdb/utils/smnotify/smnotify.c
+++ b/ctdb/utils/smnotify/smnotify.c
@@ -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;