Changeset 429 for trunk/server/source3/utils/net_conf.c

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_conf.c (modified) (6 diffs)

trunk/server/source3/utils/net_conf.c

@@ -692 +692 @@
 
         /*
+         * 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
          */
@@ -699 +710 @@
                 d_fprintf(stderr, _("Error creating share %s: %s\n"),
                           sharename, win_errstr(werr));
-                goto done;
+                goto cancel;
         }
 
@@ -710 +721 @@
                 d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
                           "path", win_errstr(werr));
-                goto done;
+                goto cancel;
         }
 
@@ -719 +730 @@
                         d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
                                   "comment", win_errstr(werr));
-                        goto done;
+                        goto cancel;
                 }
         }
@@ -727 +738 @@
                 d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
                           "'guest ok'", win_errstr(werr));
-                goto done;
+                goto cancel;
         }
 
@@ -735 +746 @@
                 d_fprintf(stderr, _("Error setting parameter %s: %s\n"),
                           "writeable", win_errstr(werr));
-                goto done;
-        }
-
-        ret = 0;
+                goto cancel;
+        }
+
+        /*
+         * 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: