[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2264-g2c41d69

[Günther Deschner]

The branch, v3-3-test has been updated
       via  2c41d69bcf6f0897ef9d444a8f167aff1772d562 (commit)
      from  d8372f73b93d3f323310f5456fef204884c303bb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 2c41d69bcf6f0897ef9d444a8f167aff1772d562
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 30 18:47:40 2008 +0200

    ntlmssp: replace UNKNOWN_02000000 with NTLMSSP_NEGOTIATE_VERSION.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/include/ntlmssp.h |    2 +-
 source/libsmb/ntlmssp.c  |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/ntlmssp.h b/source/include/ntlmssp.h
index 7fe1442..3fb41c5 100644
--- a/source/include/ntlmssp.h
+++ b/source/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/source/libsmb/ntlmssp.c b/source/libsmb/ntlmssp.c
index 7082ea7..a0e54ce 100644
--- a/source/libsmb/ntlmssp.c
+++ b/source/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 |


-- 
Samba Shared Repository