From: Martin Schwenke <martin@meltin.net>
Date: Thu, 16 Apr 2009 00:25:29 +0000 (+1000)
Subject: In net_conf_import, start a transaction when importing a single share.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a28b28314c6a76cf619fc5f1b676d1f4229e3e1;p=thirdparty%2Fsamba.git

In net_conf_import, start a transaction when importing a single share.

Commit d69c3db9d44ad5d9fd1f5d7a9499f3bd79ecfb47 caused the transaction
start to be conditional but the commit is still unconditional, so an
error occurs when importing a single share.

An alternate fix would be to return the transaction start to be
unconditional but then it would occur before other error checking.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index dea6209c78e..f6e3712bb8f 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -340,6 +340,14 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 		if (!W_ERROR_IS_OK(werr)) {
 			goto cancel;
 		}
+
+		werr = smbconf_transaction_start(conf_ctx);
+		if (!W_ERROR_IS_OK(werr)) {
+			d_printf("error starting transaction: %s\n",
+				 dos_errstr(werr));
+			goto done;
+		}
+
 		werr = import_process_service(c, conf_ctx, service);
 		if (!W_ERROR_IS_OK(werr)) {
 			goto cancel;