diff options
| author | Michael Adam <obnox@samba.org> | 2009-05-08 15:13:21 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-05-26 09:39:16 +0200 |
| commit | f0207897a565913efdcba0d0592a500a8868ced9 (patch) | |
| tree | 8f43230635d01fe8c26971314adf9201981fd648 /source3/smbd/process.c | |
| parent | c0c6521969956da4db75bb0198d284caa29e56d7 (diff) | |
| download | samba-f0207897a565913efdcba0d0592a500a8868ced9.tar.gz samba-f0207897a565913efdcba0d0592a500a8868ced9.tar.xz samba-f0207897a565913efdcba0d0592a500a8868ced9.zip | |
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)
Diffstat (limited to 'source3/smbd/process.c')
| -rw-r--r-- | source3/smbd/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 - |