summaryrefslogtreecommitdiff
path: root/source/lib/sharesec.c
diff options
context:
space:
mode:
authorbubulle <bubulle@alioth.debian.org>2008-11-01 11:09:46 +0000
committerbubulle <bubulle@alioth.debian.org>2008-11-01 11:09:46 +0000
commita2b71a0141763c20552bb45eeb4cb78c4b513118 (patch)
tree85b64d98387145ea4e00c1b529e1820542a979a3 /source/lib/sharesec.c
parent2203bd59918d6d70515f9dad601cb5c0ef098092 (diff)
downloadsamba-a2b71a0141763c20552bb45eeb4cb78c4b513118.tar.gz
Revert the merge of 3.3.0~pre2 in upstream branch
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source/lib/sharesec.c')
-rw-r--r--source/lib/sharesec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/lib/sharesec.c b/source/lib/sharesec.c
index 4380000080..d89434782d 100644
--- a/source/lib/sharesec.c
+++ b/source/lib/sharesec.c
@@ -51,7 +51,7 @@ static bool share_info_db_init(void)
return True;
}
- share_db = db_open(NULL, state_path("share_info.tdb"), 0,
+ share_db = db_open_trans(NULL, state_path("share_info.tdb"), 0,
TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
if (share_db == NULL) {
DEBUG(0,("Failed to open share info database %s (%s)\n",
@@ -109,7 +109,7 @@ static bool share_info_db_init(void)
if (share_db->transaction_commit(share_db) != 0) {
DEBUG(0, ("transaction_commit failed\n"));
- return false;
+ goto cancel;
}
return true;