[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  1991c2a libcli/auth/ntlm_check.c - fix parameter indentation
       via  53a3234 s4:ntlm/auth.c - add a whitespace in a debug output
       via  b11b242 s4:dsdb_module_find_dsheuristics - free the "DN" also on other exit cases
      from  433c080 s3-selftest: do not remove nsswrapper environment when running smbtorture4.

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


- Log -----------------------------------------------------------------
commit 1991c2a8ee71dc1d6841d619ef323131c71137fa
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Thu Aug 26 20:08:15 2010 +0200

    libcli/auth/ntlm_check.c - fix parameter indentation

commit 53a32347034af180c8b767607eedd346134ab4cc
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Thu Aug 26 20:07:53 2010 +0200

    s4:ntlm/auth.c - add a whitespace in a debug output

commit b11b2425a9cc919f34d7c8b1dae7b40f3cf11f08
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Thu Aug 26 18:37:00 2010 +0200

    s4:dsdb_module_find_dsheuristics - free the "DN" also on other exit cases

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

Summary of changes:
 libcli/auth/ntlm_check.c              |    6 +++---
 source4/auth/ntlm/auth.c              |    2 +-
 source4/dsdb/samdb/ldb_modules/util.c |    2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/ntlm_check.c b/libcli/auth/ntlm_check.c
index 9f968ef..5a430bd 100644
--- a/libcli/auth/ntlm_check.c
+++ b/libcli/auth/ntlm_check.c
@@ -218,7 +218,7 @@ static bool smb_sess_key_ntlmv2(TALLOC_CTX *mem_ctx,
  */
 
 NTSTATUS hash_password_check(TALLOC_CTX *mem_ctx,
-				 bool lanman_auth,
+			     bool lanman_auth,
 			     const struct samr_Password *client_lanman,
 			     const struct samr_Password *client_nt,
 			     const char *username, 
@@ -281,8 +281,8 @@ NTSTATUS hash_password_check(TALLOC_CTX *mem_ctx,
  */
 
 NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
-				 bool lanman_auth,
-				 bool ntlm_auth,
+			     bool lanman_auth,
+			     bool ntlm_auth,
 			     uint32_t logon_parameters,
 			     const DATA_BLOB *challenge,
 			     const DATA_BLOB *lm_response,
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 17fbfca..a977aa4 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -378,7 +378,7 @@ _PUBLIC_ NTSTATUS auth_check_password_recv(struct tevent_req *req,
 
 	if (tevent_req_is_nterror(req, &status)) {
 		DEBUG(2,("auth_check_password_recv: "
-			 "%s authentication for user [%s\\%s]"
+			 "%s authentication for user [%s\\%s] "
 			 "FAILED with error %s\n",
 			 (state->method ? state->method->ops->name : "NO_METHOD"),
 			 state->user_info->mapped.domain_name,
diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c
index 2323085..f046abf 100644
--- a/source4/dsdb/samdb/ldb_modules/util.c
+++ b/source4/dsdb/samdb/ldb_modules/util.c
@@ -1172,9 +1172,11 @@ const struct ldb_val *dsdb_module_find_dsheuristics(struct ldb_module *module,
 				    attrs,
 				    DSDB_FLAG_NEXT_MODULE);
 	if (ret == LDB_SUCCESS && res->count == 1) {
+		talloc_free(new_dn);
 		return ldb_msg_find_ldb_val(res->msgs[0],
 					    "dsHeuristics");
 	}
+	talloc_free(new_dn);
 	return NULL;
 }
 


-- 
Samba Shared Repository