Changeset 988 for vendor/current/source3/utils/profiles.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/utils/profiles.c (modified) (5 diffs)

vendor/current/source3/utils/profiles.c

@@ -130 +130 @@
         /* swap out the SIDs in the security descriptor */
 
-        if ( !(new_sd = dup_sec_desc( outfile->mem_ctx, nk->sec_desc->sec_desc )) ) {
-                fprintf( stderr, "Failed to copy security descriptor!\n" );
+        if (nk->sec_desc->sec_desc == NULL) {
+                fprintf(stderr, "Invalid (NULL) security descriptor!\n");
+                return false;
+        }
+
+        new_sd = security_descriptor_copy(outfile->mem_ctx,
+                                          nk->sec_desc->sec_desc);
+        if (new_sd == NULL) {
+                fprintf(stderr, "Failed to copy security descriptor!\n");
                 return False;
         }
@@ -183 +190 @@
         }
 
+
+        verbose_output("[%s]\n", path);
+
         /* values is a talloc()'d child of subkeys here so just throw it all away */
-
-        TALLOC_FREE( subkeys );
-
-        verbose_output("[%s]\n", path);
+        TALLOC_FREE(subkeys);
 
         return True;
@@ -195 +202 @@
 *********************************************************************/
 
-int main( int argc, char *argv[] )
+int main( int argc, const char *argv[] )
 {
         TALLOC_CTX *frame = talloc_stackframe();
@@ -213 +220 @@
         poptContext pc;
 
-        load_case_tables();
+        smb_init_locale();
 
         /* setup logging options */
@@ -219 +226 @@
         setup_logging( "profiles", DEBUG_STDERR);
 
-        pc = poptGetContext("profiles", argc, (const char **)argv, long_options,
+        pc = poptGetContext("profiles", argc, argv, long_options,
                 POPT_CONTEXT_KEEP_FIRST);