summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-01-29 15:04:25 +0100
committerMichael Adam <obnox@samba.org>2010-02-12 23:12:12 +0100
commit09f3ed102472304d6b4446a6fab9cf6f05c9176a (patch)
treeabf4cd4d9cd2bfc53d8dafbbc3d2465ebb1941de /source3/utils
parent83fffbeb44441a87569e543054af21d975eb20ae (diff)
downloadsamba-09f3ed102472304d6b4446a6fab9cf6f05c9176a.tar.gz
samba-09f3ed102472304d6b4446a6fab9cf6f05c9176a.tar.bz2
samba-09f3ed102472304d6b4446a6fab9cf6f05c9176a.zip
s3:make "net conf addshare" atomic by wrapping all writes in one transaction
Michael
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_conf.c42
1 files changed, 36 insertions, 6 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index e6e8e52581..67e3c85558 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -691,6 +691,17 @@ static int net_conf_addshare(struct net_context *c,
}
/*
+ * 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);