diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-10-21 09:49:30 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-01-23 21:28:06 +0100 |
| commit | 0cfe6c010fc59e09586cc69ce776d2412abb32b3 (patch) | |
| tree | d83688940db58dfd763f14a5d8cb0423eef2de69 /libcli | |
| parent | 9f0790048416020a3aaa8c0ca79e683dee159c66 (diff) | |
| download | samba-0cfe6c010fc59e09586cc69ce776d2412abb32b3.tar.gz | |
libcli/cldap: make sure the local and remote address family matches
metze
Signed-off-by: Matthieu Patou <mat@matws.net>
(cherry picked from commit 66530e91498cfa77a9d2e3a031f8a2e1c5ee6804)
(cherry picked from commit b301e0e199ec91bdf07a5022e37181d8e570ef3d)
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/cldap/cldap.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index f5585c2b730..443292113ef 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -313,6 +313,27 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx, struct tsocket_address *any = NULL; NTSTATUS status; int ret; + const char *fam = NULL; + + if (local_addr == NULL && remote_addr == NULL) { + return NT_STATUS_INVALID_PARAMETER_MIX; + } + + if (remote_addr) { + bool is_ipv4; + bool is_ipv6; + + is_ipv4 = tsocket_address_is_inet(remote_addr, "ipv4"); + is_ipv6 = tsocket_address_is_inet(remote_addr, "ipv6"); + + if (is_ipv4) { + fam = "ipv4"; + } else if (is_ipv6) { + fam = "ipv6"; + } else { + return NT_STATUS_INVALID_ADDRESS; + } + } c = talloc_zero(mem_ctx, struct cldap_socket); if (!c) { @@ -329,11 +350,10 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx, c->event.ctx = ev; if (!local_addr) { - /* we use ipv4 here instead of ip, as otherwise we end - up with a PF_INET6 socket, and sendto() for ipv4 - addresses will fail. That breaks cldap name - resolution for winbind to IPv4 hosts. */ - ret = tsocket_address_inet_from_strings(c, "ipv4", + /* + * Here we the address family of the remote address. + */ + ret = tsocket_address_inet_from_strings(c, fam, NULL, 0, &any); if (ret != 0) { |