[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1054-g448b434

[Michael Adam]

The branch, master has been updated
       via  448b434a862da0ca621c3b695dc800e9ec5e8fcf (commit)
      from  56aae35a234f19eda9702ce321b92fa382a1ada6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 448b434a862da0ca621c3b695dc800e9ec5e8fcf
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Apr 16 10:25:29 2009 +1000

    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 at meltin.net>
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/net_conf.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 3fa547b..663c592 100644
--- a/source3/utils/net_conf.c
+++ b/source3/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",
+				 win_errstr(werr));
+			goto done;
+		}
+
 		werr = import_process_service(c, conf_ctx, service);
 		if (!W_ERROR_IS_OK(werr)) {
 			goto cancel;


-- 
Samba Shared Repository