sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-26 04:23:49 +03:00
Code Activity

ntlmssp: replace UNKNOWN_02000000 with NTLMSSP_NEGOTIATE_VERSION.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner
2008-04-30 18:47:40 +02:00
parent d8372f73b9
commit 2c41d69bcf
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/include/ntlmssp.h
View File

@@ -59,7 +59,7 @@ enum NTLM_MESSAGE_TYPE
#define NTLMSSP_CHAL_NON_NT_SESSION_KEY 0x00040000 #define NTLMSSP_CHAL_NON_NT_SESSION_KEY 0x00040000
#define NTLMSSP_NEGOTIATE_NTLM2 0x00080000 #define NTLMSSP_NEGOTIATE_NTLM2 0x00080000
#define NTLMSSP_CHAL_TARGET_INFO 0x00800000 #define NTLMSSP_CHAL_TARGET_INFO 0x00800000
#define NTLMSSP_UNKNOWN_02000000 0x02000000 #define NTLMSSP_NEGOTIATE_VERSION 0x02000000
#define NTLMSSP_NEGOTIATE_128 0x20000000 /* 128-bit encryption */ #define NTLMSSP_NEGOTIATE_128 0x20000000 /* 128-bit encryption */
#define NTLMSSP_NEGOTIATE_KEY_EXCH 0x40000000 #define NTLMSSP_NEGOTIATE_KEY_EXCH 0x40000000
#define NTLMSSP_NEGOTIATE_56 0x80000000 #define NTLMSSP_NEGOTIATE_56 0x80000000

8
source/libsmb/ntlmssp.c
View File

@@ -95,6 +95,8 @@ void debug_ntlmssp_flags(uint32 neg_flags)
DEBUGADD(4, (" NTLMSSP_NEGOTIATE_NTLM2\n")); DEBUGADD(4, (" NTLMSSP_NEGOTIATE_NTLM2\n"));
if (neg_flags & NTLMSSP_CHAL_TARGET_INFO) if (neg_flags & NTLMSSP_CHAL_TARGET_INFO)
DEBUGADD(4, (" NTLMSSP_CHAL_TARGET_INFO\n")); DEBUGADD(4, (" NTLMSSP_CHAL_TARGET_INFO\n"));
if (neg_flags & NTLMSSP_NEGOTIATE_VERSION)
DEBUGADD(4, (" NTLMSSP_NEGOTIATE_VERSION\n"));
if (neg_flags & NTLMSSP_NEGOTIATE_128) if (neg_flags & NTLMSSP_NEGOTIATE_128)
DEBUGADD(4, (" NTLMSSP_NEGOTIATE_128\n")); DEBUGADD(4, (" NTLMSSP_NEGOTIATE_128\n"));
if (neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) if (neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)
@@ -449,8 +451,8 @@ static void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
/* Woop Woop - unknown flag for Windows compatibility... /* Woop Woop - unknown flag for Windows compatibility...
What does this really do ? JRA. */ What does this really do ? JRA. */
if (!(neg_flags & NTLMSSP_UNKNOWN_02000000)) { if (!(neg_flags & NTLMSSP_NEGOTIATE_VERSION)) {
ntlmssp_state->neg_flags &= ~NTLMSSP_UNKNOWN_02000000; ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_VERSION;
} }
if ((neg_flags & NTLMSSP_REQUEST_TARGET)) { if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
@@ -934,7 +936,7 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
(*ntlmssp_state)->neg_flags = (*ntlmssp_state)->neg_flags =
NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_128 |
NTLMSSP_NEGOTIATE_56 | NTLMSSP_NEGOTIATE_56 |
NTLMSSP_UNKNOWN_02000000 | NTLMSSP_NEGOTIATE_VERSION |
NTLMSSP_NEGOTIATE_ALWAYS_SIGN | NTLMSSP_NEGOTIATE_ALWAYS_SIGN |
NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_NTLM |
NTLMSSP_NEGOTIATE_NTLM2 | NTLMSSP_NEGOTIATE_NTLM2 |