[SCM] Samba Shared Repository - branch master updated - 0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92

Michael Adam obnox at samba.org
Mon Sep 29 14:34:39 GMT 2008


The branch, master has been updated
       via  0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92 (commit)
      from  ec63cd6a7f87ebbc969fa270fefdde47385217b4 (commit)

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


- Log -----------------------------------------------------------------
commit 0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Sep 18 05:01:47 2008 +0200

    s3:mapping_tdb: fix the del_aliasmem() function
    
    We should not cancel the transaction, when we want to delete a key.
    
    metze

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

Summary of changes:
 source3/groupdb/mapping_tdb.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 7cee53a..29927eb 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -666,8 +666,7 @@ static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
 
 	if (num == 0) {
 		status = dbwrap_delete_bystring(db, key);
-		TALLOC_FREE(sids);
-		goto cancel;
+		goto commit;
 	}
 
 	member_string = talloc_strdup(sids, "");
@@ -693,7 +692,7 @@ static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
 
 	status = dbwrap_store_bystring(
 		db, key, string_term_tdb_data(member_string), 0);
-
+ commit:
 	TALLOC_FREE(sids);
 
 	if (!NT_STATUS_IS_OK(status)) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list