minor back-merge from samba4

(This used to be ctdb commit c591f9b2d2847f440702e7264c7da2fd6d69f4be)

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index fa30a9510d12234882bba4ba63e1df4cec706d4f..b72faa83d7e07a9fcf97ed3527b1749309f848e0 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -1612,8 +1612,8 @@ static int dumpdb_fn(struct ctdb_context *ctdb, TDB_DATA key, TDB_DATA data, voi
        char *keystr, *datastr;
        struct ctdb_ltdb_header *h = (struct ctdb_ltdb_header *)data.dptr;
 
-       keystr  = hex_encode(ctdb, key.dptr, key.dsize);
-       datastr = hex_encode(ctdb, data.dptr+sizeof(*h), data.dsize-sizeof(*h));
+       keystr  = hex_encode_talloc(ctdb, key.dptr, key.dsize);
+       datastr = hex_encode_talloc(ctdb, data.dptr+sizeof(*h), data.dsize-sizeof(*h));
 
        fprintf(f, "dmaster: %u\n", h->dmaster);
        fprintf(f, "rsn: %llu\n", (unsigned long long)h->rsn);

diff --git a/ctdb/config.mk b/ctdb/config.mk
index 076562297f513a13310d9c5dd0fd024d86c42da7..61f1e3682330ff2d3d713f1678f269c7a3280a4a 100644 (file)
--- a/ctdb/config.mk
+++ b/ctdb/config.mk
@@ -6,25 +6,13 @@ OBJ_FILES = brlock_ctdb.o
 [SUBSYSTEM::opendb_ctdb]
 OBJ_FILES = opendb_ctdb.o
 
-##################
-[SUBSYSTEM::ctdb_tcp]
-OBJ_FILES = \
-               tcp/tcp_init.o \
-               tcp/tcp_io.o \
-               tcp/tcp_connect.o
-
 ##################
 [SUBSYSTEM::ctdb]
 OBJ_FILES = \
                ctdb_cluster.o \
-               common/ctdb.o \
-               common/ctdb_call.o \
-               common/ctdb_message.o \
-               common/ctdb_ltdb.o \
-               common/ctdb_util.o \
+               client/ctdb_client.o \
                common/ctdb_io.o \
-               common/ctdb_client.o \
-               common/ctdb_daemon.o \
-               common/ctdb_lockwait.o
+               common/ctdb_ltdb.o \
+               common/ctdb_message.o \
+               common/ctdb_util.o
 PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
-PRIVATE_DEPENDENCIES = ctdb_tcp

diff --git a/ctdb/include/includes.h b/ctdb/include/includes.h
index a345fa2e818ed0eb0c86e542e4418178b9f00363..b33542a0bcf7be07c4613c5493212c2368ce92b0 100644 (file)
--- a/ctdb/include/includes.h
+++ b/ctdb/include/includes.h
@@ -34,7 +34,7 @@ struct timeval timeval_until(const struct timeval *tv1,
 _PUBLIC_ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs);
 double timeval_elapsed(struct timeval *tv);
 char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *mem_ctx);
-char *hex_encode(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len);
+char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len);
 _PUBLIC_ const char **str_list_add(const char **list, const char *s);
 _PUBLIC_ int set_blocking(int fd, BOOL set);
 

diff --git a/ctdb/lib/util/util_file.c b/ctdb/lib/util/util_file.c
index e9050fb25f4729ca5818ad03e2d861937d80f773..21d64b20e3dab574b9d872bce71cebbcbfc05bae 100644 (file)
--- a/ctdb/lib/util/util_file.c
+++ b/ctdb/lib/util/util_file.c
@@ -102,7 +102,7 @@ _PUBLIC_ char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *me
        return file_lines_parse(p, size, numlines, mem_ctx);
 }
 
-char *hex_encode(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len)
+char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len)
 {
        int i;
        char *hex_buffer;