svn commit: samba r18761 - in branches/SAMBA_3_0/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-09-21 01:49:18 +0000 (Thu, 21 Sep 2006)
New Revision: 18761

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

Log:
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

Modified:
   branches/SAMBA_3_0/source/smbd/negprot.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/negprot.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/negprot.c	2006-09-21 00:30:47 UTC (rev 18760)
+++ branches/SAMBA_3_0/source/smbd/negprot.c	2006-09-21 01:49:18 UTC (rev 18761)
@@ -230,11 +230,8 @@
 	}
 	data_blob_free(&blob);
 
-	if (lp_security() != SEC_ADS && !lp_use_kerberos_keytab()) {
-		*pkeylen = 0;
-	} else {
-		*pkeylen = len;
-	}
+	*pkeylen = 0;
+
 	return len;
 }