[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  b4364ad... s3-auth: in make_user_info_for_reply_enc make sure to check length and data pointer of nt and lm hash.
       via  fe90496... s3-build: allow to build bin/ndrdump4 (just as bin/smbtorture4)
       via  5b17d34... ntlmssp: add decode_NTLMv2_RESPONSE to IDL.
       via  06417ab... s3-auth: fix debug message in check_winbind_security().
      from  a75feea... s3-tdb: Added missing out of memory check in rename_file_with_suffix().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b4364add896d1657263a66c55d867d28bf5ceb1b
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 16 14:18:45 2010 +0200

    s3-auth: in make_user_info_for_reply_enc make sure to check length and data
    pointer of nt and lm hash.
    
    This fixes kernel cifs client with sec=ntlmv2.
    
    Guenther

commit fe90496ce55a5845154e4477d0eb84368c450824
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 16 14:17:44 2010 +0200

    s3-build: allow to build bin/ndrdump4 (just as bin/smbtorture4)
    
    Jelmer, please check.
    
    Guenther

commit 5b17d34d6280f3a98dc0118eab41b3f7f072521d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 16 14:16:57 2010 +0200

    ntlmssp: add decode_NTLMv2_RESPONSE to IDL.
    
    Guenther

commit 06417abc7c9129958a6ef6fb002944bab133561e
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 16 12:31:11 2010 +0200

    s3-auth: fix debug message in check_winbind_security().
    
    Guenther

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

Summary of changes:
 librpc/idl/ntlmssp.idl      |    4 ++++
 source3/Makefile.in         |    4 ++++
 source3/auth/auth_util.c    |    4 ++--
 source3/auth/auth_winbind.c |    2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/ntlmssp.idl b/librpc/idl/ntlmssp.idl
index eb9ab29..e26dc31 100644
--- a/librpc/idl/ntlmssp.idl
+++ b/librpc/idl/ntlmssp.idl
@@ -313,4 +313,8 @@ interface ntlmssp
 		[in] NTLMv2_CLIENT_CHALLENGE challenge
 		);
 
+	void decode_NTLMv2_RESPONSE(
+		[in] NTLMv2_RESPONSE response
+		);
+
 }
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 82e677d..07b07df 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3278,4 +3278,8 @@ bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
 	cd ../source4 && ../buildtools/bin/waf build --targets=smbtorture
 	cp ../source4/bin/smbtorture bin/smbtorture4
 
+bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
+	cd ../source4 && ../buildtools/bin/waf build --targets=ndrdump
+	cp ../source4/bin/ndrdump bin/ndrdump4
+
 .PHONY: bin/smbtorture4
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index a93d44f..d8e8387 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -358,8 +358,8 @@ NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info,
 	return make_user_info_map(user_info, smb_name, 
 				  client_domain, 
 				  get_remote_machine_name(), 
-				  lm_resp.data ? &lm_resp : NULL, 
-				  nt_resp.data ? &nt_resp : NULL, 
+				  lm_resp.data && (lm_resp.length > 0) ? &lm_resp : NULL,
+				  nt_resp.data && (nt_resp.length > 0) ? &nt_resp : NULL,
 				  NULL, NULL, NULL,
 				  True);
 }
diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index beaba7d..f8678d5 100644
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -43,7 +43,7 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	DEBUG(10, ("Check auth for: [%s]", user_info->mapped.account_name));
+	DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
 
 	if (!auth_context) {
 		DEBUG(3,("Password for user %s cannot be checked because we have no auth_info to get the challenge from.\n", 


-- 
Samba Shared Repository