sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3:make "net conf addshare" atomic by wrapping all writes in one transaction

Browse Source 
Michael
This commit is contained in:
Michael Adam 2010-01-29 15:04:25 +01:00
parent 83fffbeb44
commit 09f3ed1024
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source3/utils/net_conf.c
View File

@ -690,6 +690,17 @@ static int net_conf_addshare(struct net_context *c,
goto done;
}
/*
* start a transaction
*/
werr = smbconf_transaction_start(conf_ctx);
if (!W_ERROR_IS_OK(werr)) {
d_printf("error starting transaction: %s\n",
win_errstr(werr));
goto done;
}
/*
* create the share
*/
@ -698,7 +709,7 @@ static int net_conf_addshare(struct net_context *c,
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, _("Error creating share %s: %s\n"),
sharename, win_errstr(werr));
goto done;
goto cancel;
}
/*
@ -709,7 +720,7 @@ static int net_conf_addshare(struct net_context *c,
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
"path", win_errstr(werr));
goto done;
goto cancel;
}
if (comment != NULL) {
@ -718,7 +729,7 @@ static int net_conf_addshare(struct net_context *c,
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
"comment", win_errstr(werr));
goto done;
goto cancel;
}
}
@ -726,7 +737,7 @@ static int net_conf_addshare(struct net_context *c,
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
"'guest ok'", win_errstr(werr));
goto done;
goto cancel;
}
werr = smbconf_set_parameter(conf_ctx, sharename, "writeable",
@ -734,10 +745,29 @@ static int net_conf_addshare(struct net_context *c,
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
"writeable", win_errstr(werr));
goto done;
goto cancel;
}
ret = 0;
/*
* commit the whole thing
*/
werr = smbconf_transaction_commit(conf_ctx);
if (!W_ERROR_IS_OK(werr)) {
d_printf("error committing transaction: %s\n",
win_errstr(werr));
} else {
ret = 0;
}
goto done;
cancel:
werr = smbconf_transaction_cancel(conf_ctx);
if (!W_ERROR_IS_OK(werr)) {
d_printf("error cancelling transaction: %s\n",
win_errstr(werr));
}
done:
TALLOC_FREE(mem_ctx);