From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 Sep 2008 03:01:47 +0000 (+0200)
Subject: s3:mapping_tdb: fix the del_aliasmem() function
X-Git-Tag: samba-4.0.0alpha6~769^2~228^2~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92;p=thirdparty%2Fsamba.git

s3:mapping_tdb: fix the del_aliasmem() function

We should not cancel the transaction, when we want to delete a key.

metze
---

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 7cee53a9689..29927eb592b 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)) {