From e86a534fa707b44baec87060745dd8a557622721 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 8 May 2009 01:11:43 +0200 Subject: s3: make release_ip() call (ctdb) cope with IPv4 mapped addresses Michael --- source3/smbd/process.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source3/smbd/process.c') diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 7605ad70b5..0f3e560611 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 - -- cgit