summaryrefslogtreecommitdiff
path: root/libcli
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-10-21 16:11:41 +0200
committerMatthieu Patou <mat@samba.org>2011-10-21 22:29:09 +0200
commit4d2d33ee09941ddb211e21788c01d886730224c2 (patch)
treeed005125987897195e3af20683c8d54126e244d6 /libcli
parent66530e91498cfa77a9d2e3a031f8a2e1c5ee6804 (diff)
downloadsamba-4d2d33ee09941ddb211e21788c01d886730224c2.tar.gz
samba-4d2d33ee09941ddb211e21788c01d886730224c2.tar.bz2
samba-4d2d33ee09941ddb211e21788c01d886730224c2.zip
libcli-cldap: avoid the case local == remote == NULL
Diffstat (limited to 'libcli')
-rw-r--r--libcli/cldap/cldap.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index 8d7cbb0408..b7df9d2283 100644
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -341,8 +341,12 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
if (!local_addr) {
/*
- * Here we the address family of the remote address.
+ * Here we know the address family of the remote address.
*/
+ if (fam == NULL) {
+ return NT_STATUS_INVALID_PARAMETER_MIX;
+ }
+
ret = tsocket_address_inet_from_strings(c, fam,
NULL, 0,
&any);