summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-09-21 01:49:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:00:55 -0500
commit8f7643bd8345de0be03b59db2e9490ee5e0ca85f (patch)
tree61e285ee6ac23185f492c8978e4371ee210fcb80 /source3/smbd
parent45ca718d1903cfd400c9e12665c59f3089fe2318 (diff)
downloadsamba-8f7643bd8345de0be03b59db2e9490ee5e0ca85f.tar.gz
samba-8f7643bd8345de0be03b59db2e9490ee5e0ca85f.tar.bz2
samba-8f7643bd8345de0be03b59db2e9490ee5e0ca85f.zip
r18761: Even if only offering NTLMSSP Windows (tested with Vista & XP) sends 0 as the
key length in the case of extended security. It does make sense because with SPNEGO our beloved ASN1 structure gives us the length. Next test I did to verify this: I modified the server to put in random garbage, and W2kwks, XP, Vista and W2k3srv still talked to us. Volker (This used to be commit f19bd479cee57f064f63659c533ae108885d54a2)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/negprot.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 4362bb5467..b984558fb4 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -230,11 +230,8 @@ static int negprot_spnego(char *p, uint8 *pkeylen)
}
data_blob_free(&blob);
- if (lp_security() != SEC_ADS && !lp_use_kerberos_keytab()) {
- *pkeylen = 0;
- } else {
- *pkeylen = len;
- }
+ *pkeylen = 0;
+
return len;
}