svn commit: samba r11523 - in branches/SAMBA_4_0/source/libcli/ldap: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-11-05 11:24:10 +0000 (Sat, 05 Nov 2005)
New Revision: 11523

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11523

Log:
Working towards having Samba3 join Samba4, this allows the SASL
credentials to be NULL, where the client is requesting a CIFS style
server-first negTokenInit.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/ldap/ldap.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.c	2005-11-05 11:13:22 UTC (rev 11522)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c	2005-11-05 11:24:10 UTC (rev 11523)
@@ -933,9 +933,13 @@
 			asn1_start_tag(data, ASN1_CONTEXT(3));
 			r->mechanism = LDAP_AUTH_MECH_SASL;
 			asn1_read_OctetString_talloc(msg, data, &r->creds.SASL.mechanism);
-			asn1_read_OctetString(data, &r->creds.SASL.secblob);
-			if (r->creds.SASL.secblob.data) {
-				talloc_steal(msg, r->creds.SASL.secblob.data);
+			if (asn1_peek_tag(data, ASN1_OCTET_STRING)) { /* optional */
+				asn1_read_OctetString(data, &r->creds.SASL.secblob);
+				if (r->creds.SASL.secblob.data) {
+					talloc_steal(msg, r->creds.SASL.secblob.data);
+				}
+			} else {
+				r->creds.SASL.secblob = data_blob(NULL, 0);
 			}
 			asn1_end_tag(data);
 		}