diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-14 23:21:47 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-06-18 08:33:25 +0200 |
| commit | c654bc0470304640b248f7f8704ee623c27a356d (patch) | |
| tree | 238e79ebf02799df7d26c913ec2e8c4da0856654 | |
| parent | ad8e0a92e30899fd4e3c8d15e062bfc0ddbbd966 (diff) | |
| download | samba-c654bc0470304640b248f7f8704ee623c27a356d.tar.gz | |
s3-winbind: make the getpeername() checks in cm_prepare_connection IPv6 aware.
Note that this failure was hard to track, as winbind did only log a super helpful
"cm_prepare_connection: Success" debug message.
IPv6 gurus, please check
Successfully tested in two independent IPv6 networks now.
Guenther
(cherry picked from commit 14ac2bb36ee22be6133ca1d069dc5de6c1891f47)
(cherry picked from commit 72d635514d9c00a09b00ed0d9928cab6a3a2f6f7)
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 34c1a397657..07294f94844 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -806,11 +806,31 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain, peeraddr_len = sizeof(peeraddr); - if ((getpeername((*cli)->fd, &peeraddr, &peeraddr_len) != 0) || - (peeraddr_len != sizeof(struct sockaddr_in)) || - (peeraddr_in->sin_family != PF_INET)) - { - DEBUG(0,("cm_prepare_connection: %s\n", strerror(errno))); + if ((getpeername((*cli)->fd, &peeraddr, &peeraddr_len) != 0)) { + DEBUG(0,("cm_prepare_connection: getpeername failed with: %s\n", + strerror(errno))); + result = NT_STATUS_UNSUCCESSFUL; + goto done; + } + + if ((peeraddr_len != sizeof(struct sockaddr_in)) +#ifdef HAVE_IPV6 + && (peeraddr_len != sizeof(struct sockaddr_in6)) +#endif + ) { + DEBUG(0,("cm_prepare_connection: got unexpected peeraddr len %d\n", + peeraddr_len)); + result = NT_STATUS_UNSUCCESSFUL; + goto done; + } + + if ((peeraddr_in->sin_family != PF_INET) +#ifdef HAVE_IPV6 + && (peeraddr_in->sin_family != PF_INET6) +#endif + ) { + DEBUG(0,("cm_prepare_connection: got unexpected family %d\n", + peeraddr_in->sin_family)); result = NT_STATUS_UNSUCCESSFUL; goto done; } |