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

[abartlet at samba.org]

Author: abartlet
Date: 2005-12-05 04:10:13 +0000 (Mon, 05 Dec 2005)
New Revision: 12062

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

Log:
SASL negotiation now requires a gensec_security context, so that we
only try permitted mechanims.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c	2005-12-05 03:42:28 UTC (rev 12061)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c	2005-12-05 04:10:13 UTC (rev 12062)
@@ -223,7 +223,7 @@
 	}
 	sasl_names[i] = NULL;
 	
-	mechs = gensec_security_by_sasl(tmp_ctx, sasl_names);
+	mechs = gensec_security_by_sasl(conn->gensec, tmp_ctx, sasl_names);
 	if (!mechs || !mechs[0]) {
 		DEBUG(1, ("None of the %d proposed SASL mechs were acceptable\n",
 			  count));