summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-09-21 05:07:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:00:55 -0500
commita4a2d795b1dc218705cf8bd148a4e59845155f7c (patch)
tree7f6044666b00f97c2f15ea56599e682198e97810 /source3
parent8f7643bd8345de0be03b59db2e9490ee5e0ca85f (diff)
downloadsamba-a4a2d795b1dc218705cf8bd148a4e59845155f7c.tar.gz
samba-a4a2d795b1dc218705cf8bd148a4e59845155f7c.tar.bz2
samba-a4a2d795b1dc218705cf8bd148a4e59845155f7c.zip
r18771: Sequel to r18761: If we always set the keylen to 0 there's no point in passing
a pointer down to negprot_spnego(). Volker (This used to be commit 18f47130b1ccf09873ca684ee0ea986e28f47d78)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/negprot.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index b984558fb4..2df7f45aba 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -169,7 +169,7 @@ static int reply_lanman2(char *inbuf, char *outbuf)
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 @@ static int negprot_spnego(char *p, uint8 *pkeylen)
}
data_blob_free(&blob);
- *pkeylen = 0;
-
return len;
}
@@ -338,10 +336,9 @@ static int reply_nt1(char *inbuf, char *outbuf)
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"));
}