[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  4a8c17a libcli/ldap Don't try and encode a control with a NULL OID
      from  39932f2 autobuild: create an autobuild.pid file

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4a8c17a41cd8412247741afbcd8abad77b2a8113
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 20 14:27:57 2010 +1100

    libcli/ldap Don't try and encode a control with a NULL OID
    
    ctrl->oid is set to NULL by the Samba4 rootDSE module when removing
    controls that should not be exposed over LDAP (to avoid a realloc).
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Wed Oct 20 04:13:44 UTC 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 libcli/ldap/ldap_message.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/ldap/ldap_message.c b/libcli/ldap/ldap_message.c
index b9f9dff..7756e73 100644
--- a/libcli/ldap/ldap_message.c
+++ b/libcli/ldap/ldap_message.c
@@ -167,6 +167,12 @@ static bool ldap_encode_control(void *mem_ctx, struct asn1_data *data,
 	}
 
 	for (i = 0; handlers[i].oid != NULL; i++) {
+		if (!ctrl->oid) {
+			/* not encoding this control, the OID has been
+			 * set to NULL indicating it isn't really
+			 * here */
+			return true;
+		}
 		if (strcmp(handlers[i].oid, ctrl->oid) == 0) {
 			if (!handlers[i].encode) {
 				if (ctrl->critical) {


-- 
Samba Shared Repository