From f0207897a565913efdcba0d0592a500a8868ced9 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 8 May 2009 15:13:21 +0200 Subject: s3:smbd: fix the fix for mapped IPv4 address handling in release_ip(). It was too late... Thanks Metze for noticing. Michael (cherry picked from commit 7d6e4c7e950592112d09f7d98393c41e8097bba8) (cherry picked from commit af5adfbd402a8d4fe31b7de5d13aa82287e88e57) --- source3/smbd/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/smbd/process.c') diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 14fa2f846a6..962b4926c88 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1882,7 +1882,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)); @@ -1890,7 +1890,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 - -- cgit