[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1501-ge86a534

[Michael Adam]

The branch, master has been updated
       via  e86a534fa707b44baec87060745dd8a557622721 (commit)
      from  53713be2cbc1156769b8b82d3df9da02459232ce (commit)

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


- Log -----------------------------------------------------------------
commit e86a534fa707b44baec87060745dd8a557622721
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 8 01:11:43 2009 +0200

    s3: make release_ip() call (ctdb) cope with IPv4 mapped addresses
    
    Michael

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

Summary of changes:
 source3/smbd/process.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 7605ad7..0f3e560 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1887,8 +1887,15 @@ received when we should release a specific IP
 static void release_ip(const char *ip, void *priv)
 {
 	char addr[INET6_ADDRSTRLEN];
+	char *p;
 
-	if (strcmp(client_socket_addr(get_client_fd(),addr,sizeof(addr)), ip) == 0) {
+	client_socket_addr(get_client_fd(),addr,sizeof(addr));
+
+	if (strncmp("::ffff:", addr, 7) == 0) {
+		p = addr + 7;
+	}
+
+	if ((strcmp(p, ip) == 0) || (strcmp(addr, ip) == 0)) {
 		/* we can't afford to do a clean exit - that involves
 		   database writes, which would potentially mean we
 		   are still running after the failover has finished -


-- 
Samba Shared Repository