merge LANMAN1/LANMAN2.1 fixes from head

diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c
index db0694a840447758bea3170fae7c365c7a07e38c..bd1b9b0d572d380b70d6f2108559adf84d62315c 100644 (file)
--- a/source/smbd/negprot.c
+++ b/source/smbd/negprot.c
@@ -101,6 +101,7 @@ static int reply_lanman1(char *inbuf, char *outbuf)
        /* Create a token value and add it to the outgoing packet. */
        if (global_encrypted_passwords_negotiated) {
                get_challenge(smb_buf(outbuf));
+               SSVAL(outbuf,smb_vwv11, 8);
        }
 
        Protocol = PROTOCOL_LANMAN1;
@@ -144,6 +145,7 @@ static int reply_lanman2(char *inbuf, char *outbuf)
        /* Create a token value and add it to the outgoing packet. */
        if (global_encrypted_passwords_negotiated) {
                get_challenge(smb_buf(outbuf));
+               SSVAL(outbuf,smb_vwv11, 8);
        }
 
        Protocol = PROTOCOL_LANMAN2;