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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/utils/profiles.c (modified) (3 diffs)

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 )) ) {