[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  642c6ba Fix Bug 8152 - smbd crash in release_ip()
      from  58b77f2 s3: Remove a use of cli_send_smb

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


- Log -----------------------------------------------------------------
commit 642c6ba2b9c581bacfcb9a6cb4c5c95d446263ce
Author: Christian Ambach <ambi at samba.org>
Date:   Thu May 19 18:13:40 2011 +0200

    Fix Bug 8152 - smbd crash in release_ip()
    
    release_ip() needs the private_data, but it was never saved away
    to feed it into release_ip() later
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Thu May 19 21:21:14 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/lib/ctdbd_conn.c |    5 +++++
 source3/smbd/process.c   |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index d271869..f422906 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1358,6 +1358,11 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
 	}
 
 	conn->release_ip_handler = release_ip_handler;
+	/*
+	 * store the IP address of the server socket for later
+	 * comparison in release_ip()
+	 */
+	conn->release_ip_priv = private_data;
 
 	/*
 	 * We want to be told about IP releases
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index d58baeb..5f9845c 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2358,6 +2358,9 @@ static void release_ip(const char *ip, void *priv)
 		p = addr + 7;
 	}
 
+	DEBUG(10, ("Got release IP message for %s, "
+		   "our address is %s\n", ip, p));
+
 	if ((strcmp(p, ip) == 0) || ((p != addr) && strcmp(addr, ip) == 0)) {
 		/* we can't afford to do a clean exit - that involves
 		   database writes, which would potentially mean we


-- 
Samba Shared Repository