get rid of compiler warnings
[ira/wip.git] / source3 / utils / smbcacls.c
index 65c88b479e08f584ba23d1ec6437adfd15418b77..9e8cbb1ddd11b35fe63e3a57edf53cd69670f818 100644 (file)
@@ -4,6 +4,8 @@
    Version 3.0
    
    Copyright (C) Andrew Tridgell 2000
+   Copyright (C) Tim Potter      2000
+   Copyright (C) Jeremy Allison  2000
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#define NO_SYSLOG
-
 #include "includes.h"
 
 static fstring password;
-static fstring username;
+static pstring username;
+static pstring owner_username;
+static fstring server;
 static int got_pass;
+static int test_args;
+TALLOC_CTX *ctx;
+
+#define CREATE_ACCESS_READ READ_CONTROL_ACCESS
+#define CREATE_ACCESS_WRITE (WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS)
 
 /* numeric is set when the user wants numeric SIDs and ACEs rather
    than going via LSA calls to resolve them */
 static int numeric;
 
-enum acl_mode {ACL_SET, ACL_DELETE, ACL_MODIFY, ACL_ADD};
+enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD };
+enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP};
+enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR};
+
+struct perm_value {
+       char *perm;
+       uint32 mask;
+};
+
+/* These values discovered by inspection */
+
+static struct perm_value special_values[] = {
+       { "R", 0x00120089 },
+       { "W", 0x00120116 },
+       { "X", 0x001200a0 },
+       { "D", 0x00010000 },
+       { "P", 0x00040000 },
+       { "O", 0x00080000 },
+       { NULL, 0 },
+};
+
+static struct perm_value standard_values[] = {
+       { "READ",   0x001200a9 },
+       { "CHANGE", 0x001301bf },
+       { "FULL",   0x001f01ff },
+       { NULL, 0 },
+};
+
+struct cli_state lsa_cli;
+POLICY_HND pol;
+struct ntuser_creds creds;
+BOOL got_policy_hnd;
+
+/* Open cli connection and policy handle */
+
+static BOOL cacls_open_policy_hnd(void)
+{
+       creds.pwd.null_pwd = 1;
+
+       /* Initialise cli LSA connection */
+
+       if (!lsa_cli.initialised && 
+           !cli_lsa_initialise(&lsa_cli, server, &creds)) {
+               return False;
+       }
+
+       /* Open policy handle */
+
+       if (!got_policy_hnd) {
 
+               /* Some systems don't support SEC_RIGHTS_MAXIMUM_ALLOWED,
+                  but NT sends 0x2000000 so we might as well do it too. */
+
+               if (cli_lsa_open_policy(&lsa_cli, lsa_cli.mem_ctx, True, 
+                                       GENERIC_EXECUTE_ACCESS, &pol)
+                   != NT_STATUS_NOPROBLEMO) {
+                       return False;
+               }
+
+               got_policy_hnd = True;
+       }
+       
+       return True;
+}
 
 /* convert a SID to a string, either numeric or username/group */
 static void SidToString(fstring str, DOM_SID *sid)
 {
-       if (numeric) {
-               sid_to_string(str, sid);
-       } else {
-               printf("need to add LSA lookups\n");
-               sid_to_string(str, sid);
+       char **names = NULL;
+       uint32 *types = NULL;
+       int num_names;
+
+       sid_to_string(str, sid);
+
+       if (numeric) return;
+
+       /* Ask LSA to convert the sid to a name */
+
+       if (!cacls_open_policy_hnd() ||
+           cli_lsa_lookup_sids(&lsa_cli, lsa_cli.mem_ctx,  &pol, 1, sid, &names, &types, 
+                               &num_names) != NT_STATUS_NOPROBLEMO ||
+           !names || !names[0]) {
+               return;
        }
+
+       /* Converted OK */
+       
+       fstrcpy(str, names[0]);
 }
 
 /* convert a string to a SID, either numeric or username/group */
-static BOOL StringToSid(DOM_SID *sid, fstring str)
+static BOOL StringToSid(DOM_SID *sid, char *str)
 {
-       if (strncmp(str,"S-", 2) == 0) {
+       uint32 *types = NULL;
+       DOM_SID *sids = NULL;
+       int num_sids;
+       BOOL result = True;
+       
+       if (strncmp(str, "S-", 2) == 0) {
                return string_to_sid(sid, str);
-       } else {
-               printf("need to add LSA lookups\n");
-               return False;
        }
+
+       if (!cacls_open_policy_hnd() ||
+           cli_lsa_lookup_names(&lsa_cli, lsa_cli.mem_ctx, &pol, 1, &str, &sids, &types, 
+                                &num_sids) != NT_STATUS_NOPROBLEMO) {
+               result = False;
+               goto done;
+       }
+
+       sid_copy(sid, &sids[0]);
+
+ done:
+
+       return result;
 }
 
 
 /* print an ACE on a FILE, using either numeric or ascii representation */
 static void print_ace(FILE *f, SEC_ACE *ace)
 {
+       struct perm_value *v;
        fstring sidstr;
-       char *perm;
+       int do_print = 0;
+       uint32 got_mask;
 
        SidToString(sidstr, &ace->sid);
 
        fprintf(f, "%s:", sidstr);
 
        if (numeric) {
-               fprintf(f, "%x/%x/%08x\n", 
+               fprintf(f, "%d/%d/0x%08x", 
                        ace->type, ace->flags, ace->info.mask);
                return;
        }
 
-       /* this interpretation is almost certainly wrong, Tim, please
-          have a look at these */
-       if (ace->info.mask == 0x001f01ff) {
-               perm = "F";
-       } else if (ace->info.mask == 0x001301bf) {
-               perm = "C";
-       } else if (ace->info.mask == 0x001200a9) {
-               perm = "R";
-       } else if (ace->info.mask == 0x00080000) {
-               perm = "N";
+       /* Ace type */
+
+       if (ace->type == SEC_ACE_TYPE_ACCESS_ALLOWED) {
+               fprintf(f, "ALLOWED");
+       } else if (ace->type == SEC_ACE_TYPE_ACCESS_DENIED) {
+               fprintf(f, "DENIED");
        } else {
-               perm = "?";
+               fprintf(f, "%d", ace->type);
+       }
+
+       /* Not sure what flags can be set in a file ACL */
+
+       fprintf(f, "/%d/", ace->flags);
+
+       /* Standard permissions */
+
+       for (v = standard_values; v->perm; v++) {
+               if (ace->info.mask == v->mask) {
+                       fprintf(f, "%s", v->perm);
+                       return;
+               }
        }
 
-       fprintf(f,"%s\n", perm);
+       /* Special permissions.  Print out a hex value if we have
+          leftover bits in the mask. */
+
+       got_mask = ace->info.mask;
+
+ again:
+       for (v = special_values; v->perm; v++) {
+               if ((ace->info.mask & v->mask) == v->mask) {
+                       if (do_print) {
+                               fprintf(f, "%s", v->perm);
+                       }
+                       got_mask &= ~v->mask;
+               }
+       }
+
+       if (!do_print) {
+               if (got_mask != 0) {
+                       fprintf(f, "0x%08x", ace->info.mask);
+               } else {
+                       do_print = 1;
+                       goto again;
+               }
+       }
 }
 
 
@@ -96,37 +227,110 @@ static void print_ace(FILE *f, SEC_ACE *ace)
 static BOOL parse_ace(SEC_ACE *ace, char *str)
 {
        char *p;
+       fstring tok;
        unsigned atype, aflags, amask;
+       DOM_SID sid;
+       SEC_ACCESS mask;
+       struct perm_value *v;
+
        ZERO_STRUCTP(ace);
-       p = strchr(str,':');
+       p = strchr_m(str,':');
        if (!p) return False;
-       *p = 0;
-       if (sscanf(p+1, "%x/%x/%08x", 
-                  &atype, &aflags, &amask) != 3 ||
-           !StringToSid(&ace->sid, str)) {
+       *p = '\0';
+       p++;
+
+       /* Try to parse numeric form */
+
+       if (sscanf(p, "%i/%i/%i", &atype, &aflags, &amask) == 3 &&
+           StringToSid(&sid, str)) {
+               goto done;
+       }
+
+       /* Try to parse text form */
+
+       if (!StringToSid(&sid, str)) {
                return False;
        }
-       ace->type = atype;
-       ace->flags = aflags;
-       ace->info.mask = amask;
-       return True;
-}
 
+       if (!next_token(&p, tok, "/", sizeof(fstring))) {
+               return False;
+       }
+
+       if (strncmp(tok, "ALLOWED", strlen("ALLOWED")) == 0) {
+               atype = SEC_ACE_TYPE_ACCESS_ALLOWED;
+       } else if (strncmp(tok, "DENIED", strlen("DENIED")) == 0) {
+               atype = SEC_ACE_TYPE_ACCESS_DENIED;
+       } else {
+               return False;
+       }
+
+       /* Only numeric form accepted for flags at present */
+
+       if (!(next_token(&p, tok, "/", sizeof(fstring)) &&
+             sscanf(tok, "%i", &aflags))) {
+               return False;
+       }
+
+       if (!next_token(&p, tok, "/", sizeof(fstring))) {
+               return False;
+       }
+
+       if (strncmp(tok, "0x", 2) == 0) {
+               if (sscanf(tok, "%i", &amask) != 1) {
+                       return False;
+               }
+               goto done;
+       }
+
+       for (v = standard_values; v->perm; v++) {
+               if (strcmp(tok, v->perm) == 0) {
+                       amask = v->mask;
+                       goto done;
+               }
+       }
+
+       p = tok;
+
+       while(*p) {
+               BOOL found = False;
+
+               for (v = special_values; v->perm; v++) {
+                       if (v->perm[0] == *p) {
+                               amask |= v->mask;
+                               found = True;
+                       }
+               }
 
+               if (!found) return False;
+               p++;
+       }
+
+       if (*p) {
+               return False;
+       }
+
+ done:
+       mask.mask = amask;
+       init_sec_ace(ace, &sid, atype, mask, aflags);
+       return True;
+}
 
 /* add an ACE to a list of ACEs in a SEC_ACL */
-static BOOL add_ace(SEC_ACL **acl, SEC_ACE *ace)
+static BOOL add_ace(SEC_ACL **the_acl, SEC_ACE *ace)
 {
-       if (! *acl) {
-               *acl = (SEC_ACL *)calloc(1, sizeof(*acl));
-               if (! *acl) return False;
-               (*acl)->revision = 3;
+       SEC_ACL *new;
+       SEC_ACE *aces;
+       if (! *the_acl) {
+               (*the_acl) = make_sec_acl(ctx, 3, 1, ace);
+               return True;
        }
 
-       (*acl)->ace = Realloc((*acl)->ace,(1+((*acl)->num_aces))*sizeof(SEC_ACE));
-       if (!(*acl)->ace) return False;
-       memcpy(&((*acl)->ace[(*acl)->num_aces]), ace, sizeof(SEC_ACE));
-       (*acl)->num_aces++;
+       aces = calloc(1+(*the_acl)->num_aces,sizeof(SEC_ACE));
+       memcpy(aces, (*the_acl)->ace, (*the_acl)->num_aces * sizeof(SEC_ACE));
+       memcpy(aces+(*the_acl)->num_aces, ace, sizeof(SEC_ACE));
+       new = make_sec_acl(ctx,(*the_acl)->revision,1+(*the_acl)->num_aces, aces);
+       free(aces);
+       (*the_acl) = new;
        return True;
 }
 
@@ -136,20 +340,16 @@ static SEC_DESC *sec_desc_parse(char *str)
        char *p = str;
        fstring tok;
        SEC_DESC *ret;
-       int sd_size;
+       size_t sd_size;
        DOM_SID *grp_sid=NULL, *owner_sid=NULL;
-       SEC_ACL *dacl=NULL, *sacl=NULL;
+       SEC_ACL *dacl=NULL;
        int revision=1;
-       int type=0x8004;
 
-       while (next_token(&p, tok, " \t,\r\n", sizeof(tok))) {
+       while (next_token(&p, tok, "\t,\r\n", sizeof(tok))) {
 
                if (strncmp(tok,"REVISION:", 9) == 0) {
                        revision = strtol(tok+9, NULL, 16);
-               }
-
-               if (strncmp(tok,"TYPE:", 5) == 0) {
-                       type = strtol(tok+5, NULL, 16);
+                       continue;
                }
 
                if (strncmp(tok,"OWNER:", 6) == 0) {
@@ -159,6 +359,7 @@ static SEC_DESC *sec_desc_parse(char *str)
                                printf("Failed to parse owner sid\n");
                                return NULL;
                        }
+                       continue;
                }
 
                if (strncmp(tok,"GROUP:", 6) == 0) {
@@ -168,32 +369,29 @@ static SEC_DESC *sec_desc_parse(char *str)
                                printf("Failed to parse group sid\n");
                                return NULL;
                        }
+                       continue;
                }
 
-               if (strncmp(tok,"DACL:", 5) == 0) {
+               if (strncmp(tok,"ACL:", 4) == 0) {
                        SEC_ACE ace;
-                       if (!parse_ace(&ace, tok+5) || 
-                           !add_ace(&dacl, &ace)) {
-                               printf("Failed to parse DACL\n");
+                       if (!parse_ace(&ace, tok+4)) {
+                               printf("Failed to parse ACL %s\n", tok);
                                return NULL;
                        }
-               }
-
-               if (strncmp(tok,"SACL:", 5) == 0) {
-                       SEC_ACE ace;
-                       if (!parse_ace(&ace, tok+5) || 
-                           !add_ace(&sacl, &ace)) {
-                               printf("Failed to parse SACL\n");
+                       if(!add_ace(&dacl, &ace)) {
+                               printf("Failed to add ACL %s\n", tok);
                                return NULL;
                        }
+                       continue;
                }
+
+               printf("Failed to parse security descriptor\n");
+               return NULL;
        }
 
-       ret = make_sec_desc(revision, type, owner_sid, grp_sid, 
-                           sacl, dacl, &sd_size);
+       ret = make_sec_desc(ctx,revision, owner_sid, grp_sid, 
+                           NULL, dacl, &sd_size);
 
-       free_sec_acl(&sacl);
-       free_sec_acl(&dacl);
        if (grp_sid) free(grp_sid);
        if (owner_sid) free(owner_sid);
 
@@ -207,7 +405,7 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd)
        fstring sidstr;
        int i;
 
-       printf("REVISION:%x TYPE:%x\n", sd->revision, sd->type);
+       printf("REVISION:%d\n", sd->revision);
 
        /* Print owner and group sid */
 
@@ -230,84 +428,181 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd)
        /* Print aces */
        for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
                SEC_ACE *ace = &sd->dacl->ace[i];
-               fprintf(f, "DACL:");
+               fprintf(f, "ACL:");
                print_ace(f, ace);
+               fprintf(f, "\n");
        }
 
-       for (i = 0; sd->sacl && i < sd->sacl->num_aces; i++) {
-               SEC_ACE *ace = &sd->sacl->ace[i];
-               fstring sidstr;
-
-               SidToString(sidstr, &ace->sid);
-
-               fprintf(f, "SACL:%s:%x:%x:%08x\n", sidstr, 
-                       ace->type, ace->flags,
-                       ace->info.mask);
-       }
 }
 
-
 /***************************************************** 
 dump the acls for a file
 *******************************************************/
-static void cacl_dump(struct cli_state *cli, char *filename)
+static int cacl_dump(struct cli_state *cli, char *filename)
 {
        int fnum;
        SEC_DESC *sd;
 
-       fnum = cli_open(cli, filename, O_RDONLY, 0);
+       if (test_args) return EXIT_OK;
+
+       fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
        if (fnum == -1) {
-               printf("Failed to open %s\n", filename);
-               return;
+               printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
+               return EXIT_FAILED;
        }
 
-       sd = cli_query_secdesc(cli, fnum);
+       sd = cli_query_secdesc(cli, fnum, ctx);
 
        if (!sd) {
-               printf("ERROR: secdesc query failed\n");
-               return;
+               printf("ERROR: secdesc query failed: %s\n", cli_errstr(cli));
+               return EXIT_FAILED;
        }
 
        sec_desc_print(stdout, sd);
 
-       free_sec_desc(&sd);
+       cli_close(cli, fnum);
+
+       return EXIT_OK;
+}
+
+/***************************************************** 
+Change the ownership or group ownership of a file. Just
+because the NT docs say this can't be done :-). JRA.
+*******************************************************/
+
+static int owner_set(struct cli_state *cli, enum chown_mode change_mode, 
+                    char *filename, char *new_username)
+{
+       int fnum;
+       DOM_SID sid;
+       SEC_DESC *sd, *old;
+       size_t sd_size;
+
+       fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+
+       if (fnum == -1) {
+               printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
+               return EXIT_FAILED;
+       }
+
+       if (!StringToSid(&sid, new_username))
+               return EXIT_PARSE_ERROR;
+
+       old = cli_query_secdesc(cli, fnum, ctx);
 
        cli_close(cli, fnum);
+
+       if (!old) {
+               printf("owner_set: Failed to query old descriptor\n");
+               return EXIT_FAILED;
+       }
+
+       sd = make_sec_desc(ctx,old->revision,
+                               (change_mode == REQUEST_CHOWN) ? &sid : old->owner_sid,
+                               (change_mode == REQUEST_CHGRP) ? &sid : old->grp_sid,
+                          NULL, old->dacl, &sd_size);
+
+       fnum = cli_nt_create(cli, filename, CREATE_ACCESS_WRITE);
+
+       if (fnum == -1) {
+               printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
+               return EXIT_FAILED;
+       }
+
+       if (!cli_set_secdesc(cli, fnum, sd)) {
+               printf("ERROR: secdesc set failed: %s\n", cli_errstr(cli));
+       }
+
+       cli_close(cli, fnum);
+
+       return EXIT_OK;
+}
+
+
+/* The MSDN is contradictory over the ordering of ACE entries in an ACL.
+   However NT4 gives a "The information may have been modified by a
+   computer running Windows NT 5.0" if denied ACEs do not appear before
+   allowed ACEs. */
+
+static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2)
+{
+       if (sec_ace_equal(ace1, ace2)) return 0;
+       if (ace1->type != ace2->type) return ace2->type - ace1->type;
+       if (sid_compare(&ace1->sid, &ace2->sid)) return sid_compare(&ace1->sid, &ace2->sid);
+       if (ace1->flags != ace2->flags) return ace1->flags - ace2->flags;
+       if (ace1->info.mask != ace2->info.mask) return ace1->info.mask - ace2->info.mask;
+       if (ace1->size != ace2->size) return ace1->size - ace2->size;
+       return memcmp(ace1, ace2, sizeof(SEC_ACE));
+}
+
+static void sort_acl(SEC_ACL *the_acl)
+{
+       int i;
+       if (!the_acl) return;
+
+       qsort(the_acl->ace, the_acl->num_aces, sizeof(the_acl->ace[0]), QSORT_CAST ace_compare);
+
+       for (i=1;i<the_acl->num_aces;) {
+               if (sec_ace_equal(&the_acl->ace[i-1], &the_acl->ace[i])) {
+                       int j;
+                       for (j=i; j<the_acl->num_aces-1; j++) {
+                               the_acl->ace[j] = the_acl->ace[j+1];
+                       }
+                       the_acl->num_aces--;
+               } else {
+                       i++;
+               }
+       }
 }
 
 /***************************************************** 
 set the ACLs on a file given an ascii description
 *******************************************************/
-static void cacl_set(struct cli_state *cli, char *filename, 
-                    char *acl, enum acl_mode mode)
+static int cacl_set(struct cli_state *cli, char *filename, 
+                   char *the_acl, enum acl_mode mode)
 {
        int fnum;
        SEC_DESC *sd, *old;
-       int i, j, sd_size;
+       int i, j;
+       size_t sd_size;
+       int result = EXIT_OK;
 
-       sd = sec_desc_parse(acl);
-       if (!sd) {
-               printf("Failed to parse security descriptor\n");
-               return;
-       }
+       sd = sec_desc_parse(the_acl);
+
+       if (!sd) return EXIT_PARSE_ERROR;
+       if (test_args) return EXIT_OK;
+
+       /* The desired access below is the only one I could find that works
+          with NT4, W2KP and Samba */
+
+       fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
 
-       fnum = cli_open(cli, filename, O_RDONLY, 0);
        if (fnum == -1) {
-               printf("Failed to open %s\n", filename);
-               return;
+               printf("cacl_set failed to open %s: %s\n", filename, cli_errstr(cli));
+               return EXIT_FAILED;
        }
 
-       old = cli_query_secdesc(cli, fnum);
+       old = cli_query_secdesc(cli, fnum, ctx);
+
+       if (!old) {
+               printf("calc_set: Failed to query old descriptor\n");
+               return EXIT_FAILED;
+       }
+
+       cli_close(cli, fnum);
 
        /* the logic here is rather more complex than I would like */
        switch (mode) {
-       case ACL_DELETE:
+       case SMB_ACL_DELETE:
                for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
+                       BOOL found = False;
+
                        for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
                                if (sec_ace_equal(&sd->dacl->ace[i],
                                                  &old->dacl->ace[j])) {
-                                       if (j != old->dacl->num_aces-1) {
-                                               old->dacl->ace[j] = old->dacl->ace[j+1];
+                                       int k;
+                                       for (k=j; k<old->dacl->num_aces-1;k++) {
+                                               old->dacl->ace[k] = old->dacl->ace[k+1];
                                        }
                                        old->dacl->num_aces--;
                                        if (old->dacl->num_aces == 0) {
@@ -317,82 +612,76 @@ static void cacl_set(struct cli_state *cli, char *filename,
                                                old->dacl = NULL;
                                                old->off_dacl = 0;
                                        }
+                                       found = True;
                                        break;
                                }
                        }
-               }
-               for (i=0;sd->sacl && i<sd->sacl->num_aces;i++) {
-                       for (j=0;old->sacl && j<old->sacl->num_aces;j++) {
-                               if (sec_ace_equal(&sd->sacl->ace[i],
-                                                 &old->sacl->ace[j])) {
-                                       if (j != old->sacl->num_aces-1) {
-                                               old->sacl->ace[j] = old->sacl->ace[j+1];
-                                       }
-                                       old->sacl->num_aces--;
-                                       if (old->sacl->num_aces == 0) {
-                                               free(old->sacl->ace);
-                                               old->sacl->ace=NULL;
-                                               free(old->sacl);
-                                               old->sacl = NULL;
-                                               old->off_sacl = 0;
-                                       }
-                                       break;
-                               }
+
+                       if (!found) {
+                               printf("ACL for ACE:"); 
+                               print_ace(stdout, &sd->dacl->ace[i]);
+                               printf(" not found\n");
                        }
                }
                break;
 
-       case ACL_MODIFY:
+       case SMB_ACL_MODIFY:
                for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
+                       BOOL found = False;
+
                        for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
                                if (sid_equal(&sd->dacl->ace[i].sid,
                                              &old->dacl->ace[j].sid)) {
                                        old->dacl->ace[j] = sd->dacl->ace[i];
+                                       found = True;
                                }
                        }
-               }
-               for (i=0;sd->sacl && i<sd->sacl->num_aces;i++) {
-                       for (j=0;old->sacl && j<old->sacl->num_aces;j++) {
-                               if (sid_equal(&sd->sacl->ace[i].sid,
-                                             &old->sacl->ace[j].sid)) {
-                                       old->sacl->ace[j] = sd->sacl->ace[i];
-                               }
+
+                       if (!found) {
+                               fstring str;
+
+                               SidToString(str, &sd->dacl->ace[i].sid);
+                               printf("ACL for SID %s not found\n", str);
                        }
                }
+
                break;
 
-       case ACL_ADD:
+       case SMB_ACL_ADD:
                for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
                        add_ace(&old->dacl, &sd->dacl->ace[i]);
                }
-               for (i=0;sd->sacl && i<sd->sacl->num_aces;i++) {
-                       add_ace(&old->sacl, &sd->sacl->ace[i]);
-               }
                break;
 
-       case ACL_SET:
-               free_sec_desc(&old);
-               old = sd;
+       case SMB_ACL_SET:
+               old = sd;
                break;
-               
        }
 
-       if (sd != old) {
-               free_sec_desc(&sd);
-       }
+       /* Denied ACE entries must come before allowed ones */
+       sort_acl(old->dacl);
 
-       sd = make_sec_desc(old->revision, old->type, old->owner_sid, old->grp_sid, 
-                          old->sacl, old->dacl, &sd_size);
+       /* Create new security descriptor and set it */
+       sd = make_sec_desc(ctx,old->revision, old->owner_sid, old->grp_sid, 
+                          NULL, old->dacl, &sd_size);
+
+       fnum = cli_nt_create(cli, filename, CREATE_ACCESS_WRITE);
+
+       if (fnum == -1) {
+               printf("cacl_set failed to open %s: %s\n", filename, cli_errstr(cli));
+               return EXIT_FAILED;
+       }
 
        if (!cli_set_secdesc(cli, fnum, sd)) {
-               printf("ERROR: secdesc set failed\n");
-               return;
+               printf("ERROR: secdesc set failed: %s\n", cli_errstr(cli));
+               result = EXIT_FAILED;
        }
 
-       free_sec_desc(&sd);
-       free_sec_desc(&old);
+       /* Clean up */
 
        cli_close(cli, fnum);
+
+       return result;
 }
 
 
@@ -403,20 +692,16 @@ struct cli_state *connect_one(char *share)
 {
        struct cli_state *c;
        struct nmb_name called, calling;
-       char *server_n;
-       fstring server;
        struct in_addr ip;
        extern struct in_addr ipzero;
        extern pstring global_myname;
 
        fstrcpy(server,share+2);
-       share = strchr(server,'\\');
+       share = strchr_m(server,'\\');
        if (!share) return NULL;
        *share = 0;
        share++;
 
-       server_n = server;
-       
        ip = ipzero;
 
        make_nmb_name(&calling, global_myname, 0x0);
@@ -426,15 +711,17 @@ struct cli_state *connect_one(char *share)
        ip = ipzero;
 
        /* have to open a new connection */
-       if (!(c=cli_initialise(NULL)) || (cli_set_port(c, 139) == 0) ||
-           !cli_connect(c, server_n, &ip)) {
-               DEBUG(0,("Connection to %s failed\n", server_n));
+       if (!(c=cli_initialise(NULL)) || !cli_connect(c, server, &ip)) {
+               DEBUG(0,("Connection to %s failed\n", server));
+               cli_shutdown(c);
+               safe_free(c);
                return NULL;
        }
 
        if (!cli_session_request(c, &calling, &called)) {
                DEBUG(0,("session request to %s failed\n", called.name));
                cli_shutdown(c);
+               safe_free(c);
                if (strcmp(called.name, "*SMBSERVER")) {
                        make_nmb_name(&called , "*SMBSERVER", 0x20);
                        goto again;
@@ -447,6 +734,7 @@ struct cli_state *connect_one(char *share)
        if (!cli_negprot(c)) {
                DEBUG(0,("protocol negotiation failed\n"));
                cli_shutdown(c);
+               safe_free(c);
                return NULL;
        }
 
@@ -462,6 +750,8 @@ struct cli_state *connect_one(char *share)
                               password, strlen(password),
                               lp_workgroup())) {
                DEBUG(0,("session setup failed: %s\n", cli_errstr(c)));
+               cli_shutdown(c);
+               safe_free(c);
                return NULL;
        }
 
@@ -471,6 +761,7 @@ struct cli_state *connect_one(char *share)
                            password, strlen(password)+1)) {
                DEBUG(0,("tree connect failed: %s\n", cli_errstr(c)));
                cli_shutdown(c);
+               safe_free(c);
                return NULL;
        }
 
@@ -483,16 +774,23 @@ struct cli_state *connect_one(char *share)
 static void usage(void)
 {
        printf(
-"Usage:\n\
-  smbcacls //server1/share1 filename [options]\n\n\
+"Usage: smbcacls //server1/share1 filename [options]\n\
 \n\
-  -D <acls>               delete an acl\n\
-  -M <acls>               modify an acl\n\
-  -A <acls>               add an acl\n\
-  -S <acls>               set acls\n\
+\t-D <acls>               delete an acl\n\
+\t-M <acls>               modify an acl\n\
+\t-A <acls>               add an acl\n\
+\t-S <acls>               set acls\n\
+\t-C username             change ownership of a file\n\
+\t-G username             change group ownership of a file\n\
+\t-n                      don't resolve sids or masks to names\n\
+\t-h                      print help\n\
+\t-d debuglevel           set debug output level\n\
+\t-U username             user to autheticate as\n\
 \n\
-  an acl is of the form SID:type/flags/mask\n\
-  you can string acls together with spaces, commas or newlines\n\
+The username can be of the form username%%password or\n\
+workgroup\\username%%password.\n\n\
+An acl is of the form ACL:<SID>:type/flags/mask\n\
+You can string acls together with spaces, commas or newlines\n\
 ");
 }
 
@@ -502,54 +800,62 @@ static void usage(void)
  int main(int argc,char *argv[])
 {
        char *share;
-       char *filename;
+       pstring filename;
        extern char *optarg;
        extern int optind;
        extern FILE *dbf;
        int opt;
        char *p;
-       int seed;
        static pstring servicesf = CONFIGFILE;
-       struct cli_state *cli;
-       enum acl_mode mode;
-       char *acl = NULL;
+       struct cli_state *cli=NULL;
+       enum acl_mode mode = SMB_ACL_SET;
+       char *the_acl = NULL;
+       enum chown_mode change_mode = REQUEST_NONE;
+       int result;
+
+       ctx=talloc_init();
 
        setlinebuf(stdout);
 
        dbf = stderr;
 
-       if (argc < 4 || argv[1][0] == '-') {
+       if (argc < 3 || argv[1][0] == '-') {
                usage();
-               exit(1);
+               talloc_destroy(ctx);
+               exit(EXIT_PARSE_ERROR);
        }
 
        setup_logging(argv[0],True);
 
        share = argv[1];
-       filename = argv[2];
+       pstrcpy(filename, argv[2]);
        all_string_sub(share,"/","\\",0);
 
        argc -= 2;
        argv += 2;
 
        TimeInit();
-       charset_initialise();
 
        lp_load(servicesf,True,False,False);
-       codepage_initialise(lp_client_code_page());
        load_interfaces();
 
        if (getenv("USER")) {
                pstrcpy(username,getenv("USER"));
-       }
 
-       seed = time(NULL);
+               if ((p=strchr_m(username,'%'))) {
+                       *p = 0;
+                       pstrcpy(password,p+1);
+                       got_pass = True;
+                       memset(strchr_m(getenv("USER"), '%') + 1, 'X',
+                              strlen(password));
+               }
+       }
 
-       while ((opt = getopt(argc, argv, "U:nhS:D:A:M:")) != EOF) {
+       while ((opt = getopt(argc, argv, "U:nhS:D:A:M:C:G:td:")) != EOF) {
                switch (opt) {
                case 'U':
                        pstrcpy(username,optarg);
-                       p = strchr(username,'%');
+                       p = strchr_m(username,'%');
                        if (p) {
                                *p = 0;
                                pstrcpy(password, p+1);
@@ -558,49 +864,97 @@ static void usage(void)
                        break;
 
                case 'S':
-                       acl = optarg;
-                       mode = ACL_SET;
+                       the_acl = optarg;
+                       mode = SMB_ACL_SET;
                        break;
 
                case 'D':
-                       acl = optarg;
-                       mode = ACL_DELETE;
+                       the_acl = optarg;
+                       mode = SMB_ACL_DELETE;
                        break;
 
                case 'M':
-                       acl = optarg;
-                       mode = ACL_MODIFY;
+                       the_acl = optarg;
+                       mode = SMB_ACL_MODIFY;
                        break;
 
                case 'A':
-                       acl = optarg;
-                       mode = ACL_ADD;
+                       the_acl = optarg;
+                       mode = SMB_ACL_ADD;
+                       break;
+
+               case 'C':
+                       pstrcpy(owner_username,optarg);
+                       change_mode = REQUEST_CHOWN;
+                       break;
+
+               case 'G':
+                       pstrcpy(owner_username,optarg);
+                       change_mode = REQUEST_CHGRP;
                        break;
 
                case 'n':
                        numeric = 1;
                        break;
 
+               case 't':
+                       test_args = 1;
+                       break;
+
                case 'h':
                        usage();
-                       exit(1);
+                       talloc_destroy(ctx);
+                       exit(EXIT_PARSE_ERROR);
+
+               case 'd':
+                       DEBUGLEVEL = atoi(optarg);
+                       break;
+
                default:
                        printf("Unknown option %c (%d)\n", (char)opt, opt);
-                       exit(1);
+                       talloc_destroy(ctx);
+                       exit(EXIT_PARSE_ERROR);
                }
        }
 
        argc -= optind;
        argv += optind;
+       
+       if (argc > 0) {
+               usage();
+               talloc_destroy(ctx);
+               exit(EXIT_PARSE_ERROR);
+       }
 
-       cli = connect_one(share);
-       if (!cli) exit(1);
+       /* Make connection to server */
 
-       if (acl) {
-               cacl_set(cli, filename, acl, mode);
+       if (!test_args) {
+               cli = connect_one(share);
+               if (!cli) {
+                       talloc_destroy(ctx);
+                       exit(EXIT_FAILED);
+               }
+       }
+
+       all_string_sub(filename, "/", "\\", 0);
+       if (filename[0] != '\\') {
+               pstring s;
+               s[0] = '\\';
+               safe_strcpy(&s[1], filename, sizeof(pstring)-1);
+               pstrcpy(filename, s);
+       }
+
+       /* Perform requested action */
+
+       if (change_mode != REQUEST_NONE) {
+               result = owner_set(cli, change_mode, filename, owner_username);
+       } else if (the_acl) {
+               result = cacl_set(cli, filename, the_acl, mode);
        } else {
-               cacl_dump(cli, filename);
+               result = cacl_dump(cli, filename);
        }
 
-       return(0);
+       talloc_destroy(ctx);
+
+       return result;
 }