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

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

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

vendor/current/source3/utils/profiles.c

@@ -1 @@
-/* 
-   Samba Unix/Linux SMB client utility profiles.c 
-   
-   Copyright (C) Richard Sharpe, <rsharpe@richardsharpe.com>   2002 
-   Copyright (C) Jelmer Vernooij (conversion to popt)          2003 
-   Copyright (C) Gerald (Jerry) Carter                         2005 
+/*
+   Samba Unix/Linux SMB client utility profiles.c
+
+   Copyright (C) Richard Sharpe, <rsharpe@richardsharpe.com>   2002
+   Copyright (C) Jelmer Vernooij (conversion to popt)          2003
+   Copyright (C) Gerald (Jerry) Carter                         2005
 
    This program is free software; you can redistribute it and/or modify
@@ -10 +10 @@
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-                                  
+
 #include "includes.h"
-#include "regfio.h"
+#include "system/filesys.h"
+#include "popt_common.h"
+#include "registry/reg_objects.h"
+#include "registry/regfio.h"
+#include "../libcli/security/security.h"
 
 /* GLOBAL VARIABLES */
 
-DOM_SID old_sid, new_sid;
+struct dom_sid old_sid, new_sid;
 int change = 0, new_val = 0;
 int opt_verbose = False;
@@ -56 +60 @@
 ********************************************************************/
 
-static bool swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 )
+static bool swap_sid_in_acl( struct security_descriptor *sd, struct dom_sid *s1, struct dom_sid *s2 )
 {
-        SEC_ACL *theacl;
+        struct security_acl *theacl;
         int i;
         bool update = False;
 
         verbose_output("  Owner SID: %s\n", sid_string_tos(sd->owner_sid));
-        if ( sid_equal( sd->owner_sid, s1 ) ) {
+        if ( dom_sid_equal( sd->owner_sid, s1 ) ) {
                 sid_copy( sd->owner_sid, s2 );
                 update = True;
-                verbose_output("  New Owner SID: %s\n", 
+                verbose_output("  New Owner SID: %s\n",
                         sid_string_tos(sd->owner_sid));
 
@@ -72 +76 @@
 
         verbose_output("  Group SID: %s\n", sid_string_tos(sd->group_sid));
-        if ( sid_equal( sd->group_sid, s1 ) ) {
+        if ( dom_sid_equal( sd->group_sid, s1 ) ) {
                 sid_copy( sd->group_sid, s2 );
                 update = True;
-                verbose_output("  New Group SID: %s\n", 
+                verbose_output("  New Group SID: %s\n",
                         sid_string_tos(sd->group_sid));
         }
@@ -82 +86 @@
         verbose_output("  DACL: %d entries:\n", theacl->num_aces);
         for ( i=0; i<theacl->num_aces; i++ ) {
-                verbose_output("    Trustee SID: %s\n", 
+                verbose_output("    Trustee SID: %s\n",
                         sid_string_tos(&theacl->aces[i].trustee));
-                if ( sid_equal( &theacl->aces[i].trustee, s1 ) ) {
+                if ( dom_sid_equal( &theacl->aces[i].trustee, s1 ) ) {
                         sid_copy( &theacl->aces[i].trustee, s2 );
                         update = True;
-                        verbose_output("    New Trustee SID: %s\n", 
+                        verbose_output("    New Trustee SID: %s\n",
                                 sid_string_tos(&theacl->aces[i].trustee));
                 }
@@ -96 +100 @@
         verbose_output("  SACL: %d entries: \n", theacl->num_aces);
         for ( i=0; i<theacl->num_aces; i++ ) {
-                verbose_output("    Trustee SID: %s\n", 
+                verbose_output("    Trustee SID: %s\n",
                         sid_string_tos(&theacl->aces[i].trustee));
-                if ( sid_equal( &theacl->aces[i].trustee, s1 ) ) {
+                if ( dom_sid_equal( &theacl->aces[i].trustee, s1 ) ) {
                         sid_copy( &theacl->aces[i].trustee, s2 );
                         update = True;
-                        verbose_output("    New Trustee SID: %s\n", 
+                        verbose_output("    New Trustee SID: %s\n",
                                 sid_string_tos(&theacl->aces[i].trustee));
                 }
@@ -117 +121 @@
 {
         REGF_NK_REC *key, *subkey;
-        SEC_DESC *new_sd;
+        struct security_descriptor *new_sd;
         struct regval_ctr *values;
         struct regsubkey_ctr *subkeys;
@@ -140 +144 @@
         }
 
-        if ( !(values = TALLOC_ZERO_P( subkeys, struct regval_ctr )) ) {
+        werr = regval_ctr_init(subkeys, &values);
+        if (!W_ERROR_IS_OK(werr)) {
                 TALLOC_FREE( subkeys );
                 DEBUG(0,("copy_registry_tree: talloc() failure!\n"));
@@ -150 +155 @@
         for ( i=0; i<nk->num_values; i++ ) {
                 regval_ctr_addvalue( values, nk->values[i].valuename, nk->values[i].type,
-                        (const char *)nk->values[i].data, (nk->values[i].data_size & ~VK_DATA_IN_OFFSET) );
+                        nk->values[i].data, (nk->values[i].data_size & ~VK_DATA_IN_OFFSET) );
         }
 
@@ -212 +217 @@
         /* setup logging options */
 
-        setup_logging( "profiles", True );
-        dbf = x_stderr;
-        x_setbuf( x_stderr, NULL );
+        setup_logging( "profiles", DEBUG_STDERR);
 
         pc = poptGetContext("profiles", argc, (const char **)argv, long_options,