summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-08-08 11:42:06 +1000
committerMichael Adam <obnox@samba.org>2008-08-13 11:54:10 +0200
commitfe3dd9b3e6daf626ea094d1ce5fc96f89c61b7ad (patch)
tree4faa4a4856cef00f85e2b210e4a5f28b7befd8ad /source3/passdb
parent312a04528c2f3439f0451414fee224dfa4fcb6f4 (diff)
downloadsamba-fe3dd9b3e6daf626ea094d1ce5fc96f89c61b7ad.tar.gz
samba-fe3dd9b3e6daf626ea094d1ce5fc96f89c61b7ad.tar.bz2
samba-fe3dd9b3e6daf626ea094d1ce5fc96f89c61b7ad.zip
fixed lots of places that paniced on a failed transaction_commit,
thinking it was a failure of a transaction cancel (This used to be commit 22dbe158ed62ae47bbcb41bba3db345294f75437)
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/pdb_tdb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 824e61b063..e40f4bbab8 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -804,7 +804,7 @@ static bool tdbsam_convert(struct db_context *db, int32 from)
if (db->transaction_commit(db) != 0) {
DEBUG(0, ("Could not commit transaction\n"));
- goto cancel;
+ return false;
}
return true;
@@ -1064,7 +1064,7 @@ static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods,
if (db_sam->transaction_commit(db_sam) != 0) {
DEBUG(0, ("Could not commit transaction\n"));
- goto cancel;
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
return NT_STATUS_OK;
@@ -1191,7 +1191,7 @@ static bool tdb_update_sam(struct pdb_methods *my_methods, struct samu* newpwd,
if (db_sam->transaction_commit(db_sam) != 0) {
DEBUG(0, ("Could not commit transaction\n"));
- goto cancel;
+ return false;
}
return true;
@@ -1344,7 +1344,8 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods,
* account back?
*/
DEBUG(0, ("transaction_commit failed\n"));
- goto cancel;
+ TALLOC_FREE(new_acct);
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
TALLOC_FREE(new_acct );