Changeset 223 for branches/samba-3.3.x/source/utils

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

Location:

branches/samba-3.3.x/source/utils

Files:

• net_conf.c (modified) (2 diffs)
• net_rpc_registry.c (modified) (2 diffs)
• profiles.c (modified) (3 diffs)

branches/samba-3.3.x/source/utils/net_conf.c

@@ -339 +339 @@
                                          &service);
                 if (!W_ERROR_IS_OK(werr)) {
-                        goto done;
+                        goto cancel;
                 }
                 werr = import_process_service(c, conf_ctx, service);
                 if (!W_ERROR_IS_OK(werr)) {
-                        goto done;
+                        goto cancel;
                 }
         } else {
@@ -353 +353 @@
                                           &services);
                 if (!W_ERROR_IS_OK(werr)) {
-                        goto done;
+                        goto cancel;
                 }
                 if (!c->opt_testmode) {
                         werr = smbconf_drop(conf_ctx);
                         if (!W_ERROR_IS_OK(werr)) {
-                                goto done;
-                        }
-                }
+                                goto cancel;
+                        }
+                }
+
+                /*
+                 * Wrap the importing of shares into a transaction,
+                 * but only 100 at a time, in order to serve memory.
+                 * The allocated memory accumulates across the actions
+                 * within the transaction, and for me, some 1500
+                 * imported shares, the MAX_TALLOC_SIZE of 256 MB
+                 * was exceeded.
+                 */
+                werr = smbconf_transaction_start(conf_ctx);
+                if (!W_ERROR_IS_OK(werr)) {
+                        d_printf("error starting transaction: %s\n",
+                                 win_errstr(werr));
+                        goto done;
+                }
+
                 for (sidx = 0; sidx < num_shares; sidx++) {
                         werr = import_process_service(c, conf_ctx,
                                                       services[sidx]);
                         if (!W_ERROR_IS_OK(werr)) {
+                                goto cancel;
+                        }
+
+                        if (sidx % 100) {
+                                continue;
+                        }
+
+                        werr = smbconf_transaction_commit(conf_ctx);
+                        if (!W_ERROR_IS_OK(werr)) {
+                                d_printf("error committing transaction: %s\n",
+                                         win_errstr(werr));
                                 goto done;
                         }
-                }
-        }
-
-        ret = 0;
+                        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 = 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:

branches/samba-3.3.x/source/utils/net_rpc_registry.c

@@ -972 +972 @@
         REGF_NK_REC *key, *subkey;
         REGVAL_CTR *values = NULL;
-        REGSUBKEY_CTR *subkeys = NULL;
+        struct regsubkey_ctr *subkeys = NULL;
         int i;
         char *path = NULL;
-
-        if ( !( subkeys = TALLOC_ZERO_P( infile->mem_ctx, REGSUBKEY_CTR )) ) {
-                DEBUG(0,("write_registry_tree: talloc() failed!\n"));
+        WERROR werr;
+
+        werr = regsubkey_ctr_init(infile->mem_ctx, &subkeys);
+        if (!W_ERROR_IS_OK(werr)) {
+                DEBUG(0, ("write_registry_tree: regsubkey_ctr_init failed: "
+                          "%s\n", dos_errstr(werr)));
                 return false;
         }
@@ -994 +997 @@
         }
 
-        /* copy subkeys into the REGSUBKEY_CTR */
+        /* copy subkeys into the struct regsubkey_ctr */
 
         while ( (subkey = regfio_fetch_subkey( infile, nk )) ) {

branches/samba-3.3.x/source/utils/profiles.c

@@ -119 +119 @@
         SEC_DESC *new_sd;
         REGVAL_CTR *values;
-        REGSUBKEY_CTR *subkeys;
+        struct regsubkey_ctr *subkeys;
         int i;
         char *path;
+        WERROR werr;
 
         /* swap out the SIDs in the security descriptor */
@@ -133 +134 @@
         swap_sid_in_acl( new_sd, &old_sid, &new_sid );
 
-        if ( !(subkeys = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR )) ) {
+        werr = regsubkey_ctr_init(NULL, &subkeys);
+        if (!W_ERROR_IS_OK(werr)) {
                 DEBUG(0,("copy_registry_tree: talloc() failure!\n"));
                 return False;
@@ -151 +153 @@
         }
 
-        /* copy subkeys into the REGSUBKEY_CTR */
+        /* copy subkeys into the struct regsubkey_ctr */
 
         while ( (subkey = regfio_fetch_subkey( infile, nk )) ) {