summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-04-30 18:47:40 +0200
committerGünther Deschner <gd@samba.org>2008-04-30 18:55:57 +0200
commite7142ef180d88e5e0daa6b853a04ff9f1ce4d22a (patch)
tree9be9b3116adaef28af23bb386a7026c344f32be0
parentfb623c942d2b9dd3b9a47ee62593fd04805411d3 (diff)
downloadsamba-e7142ef180d88e5e0daa6b853a04ff9f1ce4d22a.tar.gz
samba-e7142ef180d88e5e0daa6b853a04ff9f1ce4d22a.tar.bz2
samba-e7142ef180d88e5e0daa6b853a04ff9f1ce4d22a.zip
ntlmssp: replace UNKNOWN_02000000 with NTLMSSP_NEGOTIATE_VERSION.
Guenther (This used to be commit 2c41d69bcf6f0897ef9d444a8f167aff1772d562)
-rw-r--r--source3/include/ntlmssp.h2
-rw-r--r--source3/libsmb/ntlmssp.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index 7fe1442b4c..3fb41c5613 100644
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -59,7 +59,7 @@ enum NTLM_MESSAGE_TYPE
#define NTLMSSP_CHAL_NON_NT_SESSION_KEY 0x00040000
#define NTLMSSP_NEGOTIATE_NTLM2 0x00080000
#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_KEY_EXCH 0x40000000
#define NTLMSSP_NEGOTIATE_56 0x80000000
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 7082ea7e4e..a0e54ce769 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -95,6 +95,8 @@ void debug_ntlmssp_flags(uint32 neg_flags)
DEBUGADD(4, (" NTLMSSP_NEGOTIATE_NTLM2\n"));
if (neg_flags & NTLMSSP_CHAL_TARGET_INFO)
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)
DEBUGADD(4, (" NTLMSSP_NEGOTIATE_128\n"));
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...
What does this really do ? JRA. */
- if (!(neg_flags & NTLMSSP_UNKNOWN_02000000)) {
- ntlmssp_state->neg_flags &= ~NTLMSSP_UNKNOWN_02000000;
+ if (!(neg_flags & NTLMSSP_NEGOTIATE_VERSION)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_VERSION;
}
if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
@@ -934,7 +936,7 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
(*ntlmssp_state)->neg_flags =
NTLMSSP_NEGOTIATE_128 |
NTLMSSP_NEGOTIATE_56 |
- NTLMSSP_UNKNOWN_02000000 |
+ NTLMSSP_NEGOTIATE_VERSION |
NTLMSSP_NEGOTIATE_ALWAYS_SIGN |
NTLMSSP_NEGOTIATE_NTLM |
NTLMSSP_NEGOTIATE_NTLM2 |