summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-09-18 05:01:47 +0200
committerMichael Adam <obnox@samba.org>2008-09-29 16:36:10 +0200
commit0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92 (patch)
treecec83de2d42d5a4bd3dac873457a70dbb9d72d6b
parentec63cd6a7f87ebbc969fa270fefdde47385217b4 (diff)
downloadsamba-0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92.tar.gz
samba-0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92.tar.bz2
samba-0ee4d20adb21d2e4491ca0cbfe3c031cb89fde92.zip
s3:mapping_tdb: fix the del_aliasmem() function
We should not cancel the transaction, when we want to delete a key. metze
-rw-r--r--source3/groupdb/mapping_tdb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 7cee53a968..29927eb592 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)) {