[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  bbec305... s4:"samdb_set_password" - remove delete instructions
      from  dc4c411... s4-smbtorture: skip GetAliasMembership against s4.

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


- Log -----------------------------------------------------------------
commit bbec305135cae9cb6ad95d2de1617e93b18d5659
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Dec 17 19:41:11 2009 +0100

    s4:"samdb_set_password" - remove delete instructions
    
    They won't work when the LDB change is done using "samdb_replace"
    (consider "samr_password.c" functions).
    
    I think this has been a relict which has been useful before the "password_hash"
    module existed. Basically it itself does now the updates.

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

Summary of changes:
 source4/dsdb/common/util.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 9de41cd..8ba734c 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -1863,20 +1863,15 @@ NTSTATUS samdb_set_password(struct ldb_context *ctx, TALLOC_CTX *mem_ctx,
 		 * hashes */
 		CHECK_RET(ldb_msg_add_value(mod, "clearTextPassword", new_password, NULL));
 	} else {
-		/* We don't have the cleartext, so delete the old one
-		 * and set what we have of the hashes */
-		CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "clearTextPassword"));
+		/* we don't have the cleartext, so set what we have of the
+		 * hashes */
 
 		if (lmNewHash) {
 			CHECK_RET(samdb_msg_add_hash(ctx, mem_ctx, mod, "dBCSPwd", lmNewHash));
-		} else {
-			CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "dBCSPwd"));
 		}
 
 		if (ntNewHash) {
 			CHECK_RET(samdb_msg_add_hash(ctx, mem_ctx, mod, "unicodePwd", ntNewHash));
-		} else {
-			CHECK_RET(samdb_msg_add_delete(ctx, mem_ctx, mod, "unicodePwd"));
 		}
 	}
 


-- 
Samba Shared Repository