diff options
| author | Michael Adam <obnox@samba.org> | 2009-05-08 15:13:21 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-05-08 16:42:56 +0200 |
| commit | 7d6e4c7e950592112d09f7d98393c41e8097bba8 (patch) | |
| tree | 8e64a9053a4013eeb0030220bc75e5e36671b153 /source3 | |
| parent | 66cf7e1835d5d711c91d0541b05eb11b61267ba8 (diff) | |
| download | samba-7d6e4c7e950592112d09f7d98393c41e8097bba8.tar.gz samba-7d6e4c7e950592112d09f7d98393c41e8097bba8.tar.bz2 samba-7d6e4c7e950592112d09f7d98393c41e8097bba8.zip | |
s3:smbd: fix the fix for mapped IPv4 address handling in release_ip().
It was too late... Thanks Metze for noticing.
Michael
Diffstat (limited to 'source3')
| -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 0f3e560611..487358d701 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1887,7 +1887,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)); @@ -1895,7 +1895,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 - |