The branch, v3-2-ctdb has been updated
via 0489b804805ff1d1d40c9c18ae33c5aa6d0e7a4c (commit)
from 5e91bf76bdaa916a0a6428c1ae6dae521a1674af (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -----------------------------------------------------------------
commit 0489b804805ff1d1d40c9c18ae33c5aa6d0e7a4c
Author: Michael Adam <[email protected]>
Date: Fri May 8 15:14:33 2009 +0200
s3:smbd: fix the fix for mapped IPv4 address handling in release_ip().
It was too late... Thanks Metze for noticing.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/smbd/server.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 67f528c..93ff24d 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -991,7 +991,7 @@ received when we should release a specific IP
static void release_ip(const char *ip, void *priv)
{
char addr[INET6_ADDRSTRLEN];
- char *p;
+ char *p = addr;
client_socket_addr(get_client_fd(),addr,sizeof(addr));
@@ -999,7 +999,7 @@ static void release_ip(const char *ip, void *priv)
p = addr + 7;
}
- if ((strcmp(p, ip) == 0) || (strcmp(addr, ip) == 0)) {
+ 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
are still running after the failover has finished -
--
SAMBA-CTDB repository
