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

[vlendec at samba.org]

Author: vlendec
Date: 2006-09-21 05:07:47 +0000 (Thu, 21 Sep 2006)
New Revision: 18771

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

Log:
Sequel to r18761: If we always set the keylen to 0 there's no point in passing
a pointer down to negprot_spnego().

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 04:52:49 UTC (rev 18770)
+++ branches/SAMBA_3_0/source/smbd/negprot.c	2006-09-21 05:07:47 UTC (rev 18771)
@@ -169,7 +169,7 @@
  Generate the spnego negprot reply blob. Return the number of bytes used.
 ****************************************************************************/
 
-static int negprot_spnego(char *p, uint8 *pkeylen)
+static int negprot_spnego(char *p)
 {
 	DATA_BLOB blob;
 	nstring dos_name;
@@ -230,8 +230,6 @@
 	}
 	data_blob_free(&blob);
 
-	*pkeylen = 0;
-
 	return len;
 }
 
@@ -338,10 +336,9 @@
 				 STR_UNICODE|STR_TERMINATE|STR_NOALIGN);
 		DEBUG(3,("not using SPNEGO\n"));
 	} else {
-		uint8 keylen;
-		int len = negprot_spnego(p, &keylen);
+		int len = negprot_spnego(p);
 		
-		SCVAL(outbuf,smb_vwv16+1,keylen);
+		SCVAL(outbuf,smb_vwv16+1, 0);
 		p += len;
 		DEBUG(3,("using SPNEGO\n"));
 	}