summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-03-15 05:30:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:21 -0500
commitf9827c2ad157b9a5d26028ea6f3e7e1cec871ca1 (patch)
tree656fe12fb1d84b953be91c173dc19c5443595263 /source4
parent66fe18750ce0676749dd982801e74e87deb08264 (diff)
downloadsamba-f9827c2ad157b9a5d26028ea6f3e7e1cec871ca1.tar.gz
samba-f9827c2ad157b9a5d26028ea6f3e7e1cec871ca1.tar.bz2
samba-f9827c2ad157b9a5d26028ea6f3e7e1cec871ca1.zip
r14423: don't die on no controls
(This used to be commit 9787fb8e917c22ffe910062630dc4f32473a9fab)
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/ldap/ldap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 42cad3a63e..c1fc461b5f 100644
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -1332,7 +1332,9 @@ BOOL ldap_decode(struct asn1_data *data, struct ldap_message *msg)
}
- ctrl[i] = NULL;
+ if (ctrl != NULL) {
+ ctrl[i] = NULL;
+ }
msg->controls = ctrl;