Changeset 740 for vendor/current/source3/utils/sharesec.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/sharesec.c (modified) (17 diffs)

vendor/current/source3/utils/sharesec.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "popt_common.h"
+#include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
 
 static TALLOC_CTX *ctx;
@@ -65 +68 @@
 ********************************************************************/
 
-static void print_ace(FILE *f, SEC_ACE *ace)
+static void print_ace(FILE *f, struct security_ace *ace)
 {
         const struct perm_value *v;
@@ -125 +128 @@
 ********************************************************************/
 
-static void sec_desc_print(FILE *f, SEC_DESC *sd)
+static void sec_desc_print(FILE *f, struct security_descriptor *sd)
 {
         uint32 i;
@@ -139 +142 @@
         /* Print aces */
         for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
-                SEC_ACE *ace = &sd->dacl->aces[i];
+                struct security_ace *ace = &sd->dacl->aces[i];
                 fprintf(f, "ACL:");
                 print_ace(f, ace);
@@ -150 +153 @@
 ********************************************************************/
 
-static bool parse_ace(SEC_ACE *ace, const char *orig_str)
+static bool parse_ace(struct security_ace *ace, const char *orig_str)
 {
         char *p;
@@ -158 +161 @@
         unsigned int aflags = 0;
         unsigned int amask = 0;
-        DOM_SID sid;
+        struct dom_sid sid;
         uint32_t mask;
         const struct perm_value *v;
@@ -295 +298 @@
 ********************************************************************/
 
-static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size )
-{
-        SEC_DESC *sd = NULL;
-        SEC_ACE *ace;
-        SEC_ACL *theacl;
+static struct security_descriptor* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size )
+{
+        struct security_descriptor *sd = NULL;
+        struct security_ace *ace;
+        struct security_acl *theacl;
         int num_ace;
         const char *pacl;
@@ -310 +313 @@
         num_ace = count_chars( pacl, ',' ) + 1;
 
-        if ( !(ace = TALLOC_ZERO_ARRAY( mem_ctx, SEC_ACE, num_ace )) )
+        if ( !(ace = TALLOC_ZERO_ARRAY( mem_ctx, struct security_ace, num_ace )) )
                 return NULL;
 
@@ -330 +333 @@
                 return NULL;
 
-        sd = make_sec_desc( mem_ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
+        sd = make_sec_desc( mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
                 NULL, NULL, NULL, theacl, sd_size);
 
@@ -336 +339 @@
 }
 
-/* add an ACE to a list of ACEs in a SEC_ACL */
-static bool add_ace(TALLOC_CTX *mem_ctx, SEC_ACL **the_acl, SEC_ACE *ace)
-{
-        SEC_ACL *new_ace;
-        SEC_ACE *aces;
+/* add an ACE to a list of ACEs in a struct security_acl */
+static bool add_ace(TALLOC_CTX *mem_ctx, struct security_acl **the_acl, struct security_ace *ace)
+{
+        struct security_acl *new_ace;
+        struct security_ace *aces;
         if (! *the_acl) {
                 return (((*the_acl) = make_sec_acl(mem_ctx, 3, 1, ace)) != NULL);
         }
 
-        if (!(aces = SMB_CALLOC_ARRAY(SEC_ACE, 1+(*the_acl)->num_aces))) {
-                return False;
-        }
-        memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(SEC_ACE));
-        memcpy(aces+(*the_acl)->num_aces, ace, sizeof(SEC_ACE));
+        if (!(aces = SMB_CALLOC_ARRAY(struct security_ace, 1+(*the_acl)->num_aces))) {
+                return False;
+        }
+        memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(struct
+        security_ace));
+        memcpy(aces+(*the_acl)->num_aces, ace, sizeof(struct security_ace));
         new_ace = make_sec_acl(mem_ctx,(*the_acl)->revision,1+(*the_acl)->num_aces, aces);
         SAFE_FREE(aces);
@@ -361 +365 @@
    allowed ACEs. */
 
-static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2)
+static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
 {
         if (sec_ace_equal(ace1, ace2))
@@ -369 +373 @@
                 return ace2->type - ace1->type;
 
-        if (sid_compare(&ace1->trustee, &ace2->trustee))
-                return sid_compare(&ace1->trustee, &ace2->trustee);
+        if (dom_sid_compare(&ace1->trustee, &ace2->trustee))
+                return dom_sid_compare(&ace1->trustee, &ace2->trustee);
 
         if (ace1->flags != ace2->flags)
@@ -381 +385 @@
                 return ace1->size - ace2->size;
 
-        return memcmp(ace1, ace2, sizeof(SEC_ACE));
-}
-
-static void sort_acl(SEC_ACL *the_acl)
+        return memcmp(ace1, ace2, sizeof(struct security_ace));
+}
+
+static void sort_acl(struct security_acl *the_acl)
 {
         uint32 i;
         if (!the_acl) return;
 
-        qsort(the_acl->aces, the_acl->num_aces, sizeof(the_acl->aces[0]), QSORT_CAST ace_compare);
+        TYPESAFE_QSORT(the_acl->aces, the_acl->num_aces, ace_compare);
 
         for (i=1;i<the_acl->num_aces;) {
@@ -407 +411 @@
 static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *the_acl, enum acl_mode mode)
 {
-        SEC_DESC *sd = NULL;
-        SEC_DESC *old = NULL;
+        struct security_descriptor *sd = NULL;
+        struct security_descriptor *old = NULL;
         size_t sd_size = 0;
         uint32 i, j;
@@ -458 +462 @@
 
                 for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
-                    if (sid_equal(&sd->dacl->aces[i].trustee,
+                    if (dom_sid_equal(&sd->dacl->aces[i].trustee,
                         &old->dacl->aces[j].trustee)) {
                         old->dacl->aces[j] = sd->dacl->aces[i];
@@ -541 +545 @@
 
         /* set default debug level to 1 regardless of what smb.conf sets */
-        setup_logging( "sharesec", True );
-        DEBUGLEVEL_CLASS[DBGC_ALL] = 1;
-        dbf = x_stderr;
-        x_setbuf( x_stderr, NULL );
+        setup_logging( "sharesec", DEBUG_STDERR);
+
+        load_case_tables();
+
+        lp_set_cmdline("log level", "1");
 
         pc = poptGetContext("sharesec", argc, argv, long_options, 0);
@@ -592 +597 @@
         setlinebuf(stdout);
 
-        load_case_tables();
-
-        lp_load( get_dyn_CONFIGFILE(), False, False, False, True );
+        lp_load_with_registry_shares( get_dyn_CONFIGFILE(), False, False, False,
+                                      True );
 
         /* check for initializing secrets.tdb first */
 
         if ( initialize_sid ) {
-                DOM_SID *sid = get_global_sam_sid();
+                struct dom_sid *sid = get_global_sam_sid();
 
                 if ( !sid ) {