svn commit: samba r7594 - in branches/SAMBA_4_0/source/ldap_server: .

[tridge at samba.org]

Author: tridge
Date: 2005-06-15 00:30:03 +0000 (Wed, 15 Jun 2005)
New Revision: 7594

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

Log:
abartlet is right that this hack is not actually necessary, it just
prevents a bogus:
  GSS Update failed: Miscellaneous failure (see text): ASN.1 identifier doesn't match expected value
error on every ldap connection. I'll remove it and let the error remain until Andrew
works out a better fix.

Modified:
   branches/SAMBA_4_0/source/ldap_server/ldap_bind.c


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_bind.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_bind.c	2005-06-15 00:27:51 UTC (rev 7593)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_bind.c	2005-06-15 00:30:03 UTC (rev 7594)
@@ -74,12 +74,8 @@
 		gensec_want_feature(call->conn->gensec, GENSEC_FEATURE_SIGN);
 		gensec_want_feature(call->conn->gensec, GENSEC_FEATURE_SEAL);
 		
-		if (req->creds.SASL.secblob.length >= 7 &&
-		    strncmp(req->creds.SASL.secblob.data, "NTLMSSP", 7) == 0) {
-			status = gensec_start_mech_by_sasl_name(call->conn->gensec, "NTLM");
-		} else {
-			status = gensec_start_mech_by_sasl_name(call->conn->gensec, req->creds.SASL.mechanism);
-		}
+
+		status = gensec_start_mech_by_sasl_name(call->conn->gensec, req->creds.SASL.mechanism);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(1, ("Failed to start GENSEC SASL[%s] server code: %s\n", 
 				req->creds.SASL.mechanism, nt_errstr(status)));