diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-09-21 05:07:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:00:55 -0500 |
| commit | 18f47130b1ccf09873ca684ee0ea986e28f47d78 (patch) | |
| tree | 1a795ee3399f9439a06a93d1da5c977fe1dcf76e /source/smbd/negprot.c | |
| parent | f19bd479cee57f064f63659c533ae108885d54a2 (diff) | |
| download | samba-18f47130b1ccf09873ca684ee0ea986e28f47d78.tar.gz samba-18f47130b1ccf09873ca684ee0ea986e28f47d78.tar.xz samba-18f47130b1ccf09873ca684ee0ea986e28f47d78.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
Diffstat (limited to 'source/smbd/negprot.c')
| -rw-r--r-- | source/smbd/negprot.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c index b984558fb40..2df7f45abad 100644 --- a/source/smbd/negprot.c +++ b/source/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")); } |