svn commit: samba r17223 - in branches/SAMBA_4_0/source/auth/gensec: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-07-25 02:21:54 +0000 (Tue, 25 Jul 2006)
New Revision: 17223

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

Log:
In some protocols it is not possible to negoitate off some features,
without the agreement of the peer.  This can cause problems, because
one side things sealing is disabled, while the other thinks it is
enabled.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/gensec/gensec.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec.c	2006-07-25 00:57:27 UTC (rev 17222)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec.c	2006-07-25 02:21:54 UTC (rev 17223)
@@ -927,11 +927,9 @@
 		return False;
 	}
 	
-	/* Can only 'have' a feature if you already 'want'ed it */
-	if (gensec_security->want_features & feature) {
-		return gensec_security->ops->have_feature(gensec_security, feature);
-	}
-	return False;
+	/* We might 'have' features that we don't 'want', because the
+	 * other end demanded them, or we can't neotiate them off */
+	return gensec_security->ops->have_feature(gensec_security, feature);
 }
 
 /**