summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-07-25 02:21:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:10:20 -0500
commit1ea4f560fc46703bf2ea98b348b6fb54ab08b839 (patch)
tree842f0958444d0d52b88639d7ecda2e9167903f1e
parent9d6f2767179fad2f9a067c67c09afddb6304e4eb (diff)
downloadsamba-1ea4f560fc46703bf2ea98b348b6fb54ab08b839.tar.gz
samba-1ea4f560fc46703bf2ea98b348b6fb54ab08b839.tar.bz2
samba-1ea4f560fc46703bf2ea98b348b6fb54ab08b839.zip
r17223: 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 (This used to be commit 68ddc4921f43252b3fba73e9d85cc38c359d599d)
-rw-r--r--source4/auth/gensec/gensec.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index 13ee95bad3..f93cee788e 100644
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -927,11 +927,9 @@ _PUBLIC_ BOOL gensec_have_feature(struct gensec_security *gensec_security,
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);
}
/**