s3-debug Remove 'AllowDebugChange' and use lp_set_cmdline() instead

[kai/samba.git] / source3 / utils / sharesec.c

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index da8dfa28b7400b8681e62cb1b4ba0ecc12c487d4..7ed238cdd46173343186723bb4a33354cbd74852 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -23,6 +23,8 @@
 
 
 #include "includes.h"
+#include "popt_common.h"
+#include "../libcli/security/security.h"
 
 static TALLOC_CTX *ctx;
 
@@ -124,7 +126,7 @@ static void print_ace(FILE *f, struct security_ace *ace)
  print an ascii version of a security descriptor on a FILE handle
 ********************************************************************/
 
-static void sec_desc_print(FILE *f, SEC_DESC *sd)
+static void sec_desc_print(FILE *f, struct security_descriptor *sd)
 {
        uint32 i;
 
@@ -157,7 +159,7 @@ static bool parse_ace(struct security_ace *ace, const char *orig_str)
        unsigned int atype = 0;
        unsigned int aflags = 0;
        unsigned int amask = 0;
-       DOM_SID sid;
+       struct dom_sid sid;
        uint32_t mask;
        const struct perm_value *v;
        char *str = SMB_STRDUP(orig_str);
@@ -294,9 +296,9 @@ static bool parse_ace(struct security_ace *ace, const char *orig_str)
 /********************************************************************
 ********************************************************************/
 
-static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size )
+static struct security_descriptor* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size )
 {
-       SEC_DESC *sd = NULL;
+       struct security_descriptor *sd = NULL;
        struct security_ace *ace;
        struct security_acl *theacl;
        int num_ace;
@@ -329,7 +331,7 @@ static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t
        if ( !(theacl = make_sec_acl( mem_ctx, NT4_ACL_REVISION, num_ace, ace )) )
                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);
 
        return sd;
@@ -369,8 +371,8 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
        if (ace1->type != ace2->type)
                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)
                return ace1->flags - ace2->flags;
@@ -407,8 +409,8 @@ static void sort_acl(struct security_acl *the_acl)
 
 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,7 +460,7 @@ static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *th
                bool found = False;
 
                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];
                        found = True;
@@ -541,10 +543,8 @@ int main(int argc, const char *argv[])
        }
 
        /* 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);
+       lp_set_cmdline("log level", "1");
 
        pc = poptGetContext("sharesec", argc, argv, long_options, 0);
 
@@ -599,7 +599,7 @@ int main(int argc, const char *argv[])
        /* 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 ) {
                        fprintf( stderr, "Failed to retrieve Machine SID!\n");