[SCM] CTDB repository - branch master updated - ctdb-1.0.68-12-g3b88f3d

[Ronnie Sahlberg]

The branch, master has been updated
       via  3b88f3dec5227e8579672974f7028fb356ee1d94 (commit)
      from  d9b44d7c3255b0fd7359b9afeb613e6ff4c4eaac (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3b88f3dec5227e8579672974f7028fb356ee1d94
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jan 15 13:20:33 2009 +0100

    Fix segfault in ip takeover fallback code.
    
    metze
    
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_takeover.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 456f9ec..fa9bd77 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -1030,6 +1030,7 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
 {
 	struct ctdb_client *client = ctdb_reqid_find(ctdb, client_id, struct ctdb_client);
 	struct ctdb_control_tcp *old_addr = NULL;
+	struct ctdb_control_tcp_addr new_addr;
 	struct ctdb_control_tcp_addr *tcp_sock = NULL;
 	struct ctdb_tcp_list *tcp;
 	struct ctdb_control_tcp_vnn t;
@@ -1042,6 +1043,8 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
 	switch (indata.dsize) {
 	case sizeof(struct ctdb_control_tcp):
 		old_addr = (struct ctdb_control_tcp *)indata.dptr;
+		ZERO_STRUCT(new_addr);
+		tcp_sock = &new_addr;
 		tcp_sock->src.ip  = old_addr->src;
 		tcp_sock->dest.ip = old_addr->dest;
 		break;


-- 
CTDB repository