s3: client tools: Call popt_free_cmdline_auth_info() on all normal exits.
[bbaumbach/samba-autobuild/.git] / source3 / utils / smbcacls.c
index 85b7baad007cf42d2a3de6e3e837b6571c925ca8..11289e69e4368dddf98b27d3ce181e58e2eb5226 100644 (file)
-/* 
+/*
    Unix SMB/CIFS implementation.
    ACL get/set utility
-   
+
    Copyright (C) Andrew Tridgell 2000
    Copyright (C) Tim Potter      2000
    Copyright (C) Jeremy Allison  2000
    Copyright (C) Jelmer Vernooij 2003
-   
+
    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
    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/>.
 */
 
 #include "includes.h"
+#include "popt_common.h"
+#include "rpc_client/cli_pipe.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "../libcli/security/security.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "passdb/machine_sid.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "util_sd.h"
 
 static int test_args;
 
 #define CREATE_ACCESS_READ READ_CONTROL_ACCESS
 
-/* numeric is set when the user wants numeric SIDs and ACEs rather
-   than going via LSA calls to resolve them */
-static int numeric;
+static int sddl;
+static int query_sec_info = -1;
+static int set_sec_info = -1;
+
+static const char *domain_sid = NULL;
 
 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 chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP, REQUEST_INHERIT};
 enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR};
 
-struct perm_value {
-       const char *perm;
-       uint32 mask;
-};
-
-/* These values discovered by inspection */
-
-static const struct perm_value special_values[] = {
-       { "R", 0x00120089 },
-       { "W", 0x00120116 },
-       { "X", 0x001200a0 },
-       { "D", 0x00010000 },
-       { "P", 0x00040000 },
-       { "O", 0x00080000 },
-       { NULL, 0 },
-};
-
-static const struct perm_value standard_values[] = {
-       { "READ",   0x001200a9 },
-       { "CHANGE", 0x001301bf },
-       { "FULL",   0x001f01ff },
-       { NULL, 0 },
-};
-
-/* Open cli connection and policy handle */
-
-static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
-                                  const DOM_SID *sid,
-                                  TALLOC_CTX *mem_ctx,
-                                  enum lsa_SidType *type,
-                                  char **domain, char **name)
+static NTSTATUS cli_lsa_lookup_domain_sid(struct cli_state *cli,
+                                         struct dom_sid *sid)
 {
-       uint16 orig_cnum = cli->cnum;
-       struct rpc_pipe_client *p;
+       union lsa_PolicyInformation *info = NULL;
+       uint16_t orig_cnum = cli_state_get_tid(cli);
+       struct rpc_pipe_client *rpc_pipe = NULL;
        struct policy_handle handle;
-       NTSTATUS status;
+       NTSTATUS status, result;
        TALLOC_CTX *frame = talloc_stackframe();
-       enum lsa_SidType *types;
-       char **domains;
-       char **names;
 
-       status = cli_tcon_andx(cli, "IPC$", "?????", "", 0);
+       status = cli_tree_connect(cli, "IPC$", "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               return status;
+               goto done;
        }
 
-       status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
-                                         &p);
+       status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc, &rpc_pipe);
        if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
+               goto tdis;
        }
 
-       status = rpccli_lsa_open_policy(p, talloc_tos(), True,
+       status = rpccli_lsa_open_policy(rpc_pipe, frame, True,
                                        GENERIC_EXECUTE_ACCESS, &handle);
        if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       status = rpccli_lsa_lookup_sids(p, talloc_tos(), &handle, 1, sid,
-                                       &domains, &names, &types);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
+               goto tdis;
        }
 
-       *type = types[0];
-       *domain = talloc_move(mem_ctx, &domains[0]);
-       *name = talloc_move(mem_ctx, &names[0]);
-
-       status = NT_STATUS_OK;
- fail:
-       TALLOC_FREE(p);
-       cli_tdis(cli);
-       cli->cnum = orig_cnum;
-       TALLOC_FREE(frame);
-       return status;
-}
-
-static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
-                                   const char *name,
-                                   enum lsa_SidType *type,
-                                   DOM_SID *sid)
-{
-       uint16 orig_cnum = cli->cnum;
-       struct rpc_pipe_client *p;
-       struct policy_handle handle;
-       NTSTATUS status;
-       TALLOC_CTX *frame = talloc_stackframe();
-       DOM_SID *sids;
-       enum lsa_SidType *types;
+       status = dcerpc_lsa_QueryInfoPolicy2(rpc_pipe->binding_handle,
+                                            frame, &handle,
+                                            LSA_POLICY_INFO_DOMAIN,
+                                            &info, &result);
 
-       status = cli_tcon_andx(cli, "IPC$", "?????", "", 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
-                                         &p);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       status = rpccli_lsa_open_policy(p, talloc_tos(), True,
-                                       GENERIC_EXECUTE_ACCESS, &handle);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
+       if (any_nt_status_not_ok(status, result, &status)) {
+               goto tdis;
        }
 
-       status = rpccli_lsa_lookup_names(p, talloc_tos(), &handle, 1, &name,
-                                        NULL, 1, &sids, &types);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
+       *sid = *info->domain.sid;
 
-       *type = types[0];
-       *sid = sids[0];
-
-       status = NT_STATUS_OK;
- fail:
-       TALLOC_FREE(p);
+tdis:
+       TALLOC_FREE(rpc_pipe);
        cli_tdis(cli);
-       cli->cnum = orig_cnum;
+done:
+       cli_state_set_tid(cli, orig_cnum);
        TALLOC_FREE(frame);
        return status;
 }
 
-/* convert a SID to a string, either numeric or username/group */
-static void SidToString(struct cli_state *cli, fstring str, const DOM_SID *sid)
+static struct dom_sid *get_domain_sid(struct cli_state *cli)
 {
-       char *domain = NULL;
-       char *name = NULL;
-       enum lsa_SidType type;
        NTSTATUS status;
 
-       sid_to_fstring(str, sid);
-
-       if (numeric) {
-               return;
-       }
-
-       status = cli_lsa_lookup_sid(cli, sid, talloc_tos(), &type,
-                                   &domain, &name);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               return;
-       }
-
-       if (*domain) {
-               slprintf(str, sizeof(fstring) - 1, "%s%s%s",
-                       domain, lp_winbind_separator(), name);
-       } else {
-               fstrcpy(str, name);
-       }
-}
-
-/* convert a string to a SID, either numeric or username/group */
-static bool StringToSid(struct cli_state *cli, DOM_SID *sid, const char *str)
-{
-       enum lsa_SidType type;
-
-       if (strncmp(str, "S-", 2) == 0) {
-               return string_to_sid(sid, str);
-       }
-
-       return NT_STATUS_IS_OK(cli_lsa_lookup_name(cli, str, &type, sid));
-}
-
-static void print_ace_flags(FILE *f, uint8_t flags)
-{
-       char *str = talloc_strdup(NULL, "");
-
-       if (!str) {
-               goto out;
-       }
-
-       if (flags & SEC_ACE_FLAG_OBJECT_INHERIT) {
-               str = talloc_asprintf(str, "%s%s",
-                               str, "OI|");
-               if (!str) {
-                       goto out;
-               }
-       }
-       if (flags & SEC_ACE_FLAG_CONTAINER_INHERIT) {
-               str = talloc_asprintf(str, "%s%s",
-                               str, "CI|");
-               if (!str) {
-                       goto out;
-               }
-       }
-       if (flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT) {
-               str = talloc_asprintf(str, "%s%s",
-                               str, "NP|");
-               if (!str) {
-                       goto out;
-               }
-       }
-       if (flags & SEC_ACE_FLAG_INHERIT_ONLY) {
-               str = talloc_asprintf(str, "%s%s",
-                               str, "IO|");
-               if (!str) {
-                       goto out;
-               }
-       }
-       if (flags & SEC_ACE_FLAG_INHERITED_ACE) {
-               str = talloc_asprintf(str, "%s%s",
-                               str, "I|");
-               if (!str) {
-                       goto out;
-               }
-       }
-       /* Ignore define SEC_ACE_FLAG_SUCCESSFUL_ACCESS ( 0x40 )
-          and SEC_ACE_FLAG_FAILED_ACCESS ( 0x80 ) as they're
-          audit ace flags. */
-
-       if (str[strlen(str)-1] == '|') {
-               str[strlen(str)-1] = '\0';
-               fprintf(f, "/%s/", str);
-       } else {
-               fprintf(f, "/0x%x/", flags);
-       }
-       TALLOC_FREE(str);
-       return;
-
-  out:
-       fprintf(f, "/0x%x/", flags);
-}
-
-/* print an ACE on a FILE, using either numeric or ascii representation */
-static void print_ace(struct cli_state *cli, FILE *f, SEC_ACE *ace)
-{
-       const struct perm_value *v;
-       fstring sidstr;
-       int do_print = 0;
-       uint32 got_mask;
-
-       SidToString(cli, sidstr, &ace->trustee);
-
-       fprintf(f, "%s:", sidstr);
-
-       if (numeric) {
-               fprintf(f, "%d/0x%x/0x%08x",
-                       ace->type, ace->flags, ace->access_mask);
-               return;
-       }
-
-       /* 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 {
-               fprintf(f, "%d", ace->type);
-       }
-
-       print_ace_flags(f, ace->flags);
-
-       /* Standard permissions */
-
-       for (v = standard_values; v->perm; v++) {
-               if (ace->access_mask == v->mask) {
-                       fprintf(f, "%s", v->perm);
-                       return;
-               }
-       }
-
-       /* Special permissions.  Print out a hex value if we have
-          leftover bits in the mask. */
-
-       got_mask = ace->access_mask;
-
- again:
-       for (v = special_values; v->perm; v++) {
-               if ((ace->access_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->access_mask);
-               } else {
-                       do_print = 1;
-                       goto again;
-               }
-       }
-}
-
-static bool parse_ace_flags(const char *str, unsigned int *pflags)
-{
-       const char *p = str;
-       *pflags = 0;
-
-       while (*p) {
-               if (strnequal(p, "OI", 2)) {
-                       *pflags |= SEC_ACE_FLAG_OBJECT_INHERIT;
-                       p += 2;
-               } else if (strnequal(p, "CI", 2)) {
-                       *pflags |= SEC_ACE_FLAG_CONTAINER_INHERIT;
-                       p += 2;
-               } else if (strnequal(p, "NP", 2)) {
-                       *pflags |= SEC_ACE_FLAG_NO_PROPAGATE_INHERIT;
-                       p += 2;
-               } else if (strnequal(p, "IO", 2)) {
-                       *pflags |= SEC_ACE_FLAG_INHERIT_ONLY;
-                       p += 2;
-               } else if (*p == 'I') {
-                       *pflags |= SEC_ACE_FLAG_INHERITED_ACE;
-                       p += 1;
-               } else if (*p) {
-                       return false;
-               }
-
-               if (*p != '|' && *p != '\0') {
-                       return false;
-               }
-       }
-       return true;
-}
-
-/* parse an ACE in the same format as print_ace() */
-static bool parse_ace(struct cli_state *cli, SEC_ACE *ace,
-                     const char *orig_str)
-{
-       char *p;
-       const char *cp;
-       char *tok;
-       unsigned int atype = 0;
-       unsigned int aflags = 0;
-       unsigned int amask = 0;
-       DOM_SID sid;
-       uint32_t mask;
-       const struct perm_value *v;
-       char *str = SMB_STRDUP(orig_str);
-       TALLOC_CTX *frame = talloc_stackframe();
-
-       if (!str) {
-               TALLOC_FREE(frame);
-               return False;
-       }
-
-       ZERO_STRUCTP(ace);
-       p = strchr_m(str,':');
-       if (!p) {
-               printf("ACE '%s': missing ':'.\n", orig_str);
-               SAFE_FREE(str);
-               TALLOC_FREE(frame);
-               return False;
-       }
-       *p = '\0';
-       p++;
-       /* Try to parse numeric form */
-
-       if (sscanf(p, "%i/%i/%i", &atype, &aflags, &amask) == 3 &&
-           StringToSid(cli, &sid, str)) {
-               goto done;
-       }
-
-       /* Try to parse text form */
-
-       if (!StringToSid(cli, &sid, str)) {
-               printf("ACE '%s': failed to convert '%s' to SID\n",
-                       orig_str, str);
-               SAFE_FREE(str);
-               TALLOC_FREE(frame);
-               return False;
-       }
-
-       cp = p;
-       if (!next_token_talloc(frame, &cp, &tok, "/")) {
-               printf("ACE '%s': failed to find '/' character.\n",
-                       orig_str);
-               SAFE_FREE(str);
-               TALLOC_FREE(frame);
-               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 {
-               printf("ACE '%s': missing 'ALLOWED' or 'DENIED' entry at '%s'\n",
-                       orig_str, tok);
-               SAFE_FREE(str);
-               TALLOC_FREE(frame);
-               return False;
-       }
-
-       /* Only numeric form accepted for flags at present */
-
-       if (!next_token_talloc(frame, &cp, &tok, "/")) {
-               printf("ACE '%s': bad flags entry at '%s'\n",
-                       orig_str, tok);
-               SAFE_FREE(str);
-               TALLOC_FREE(frame);
-               return False;
+       struct dom_sid *sid = talloc(talloc_tos(), struct dom_sid);
+       if (sid == NULL) {
+               DEBUG(0, ("Out of memory\n"));
+               return NULL;
        }
 
-       if (tok[0] < '0' || tok[0] > '9') {
-               if (!parse_ace_flags(tok, &aflags)) {
-                       printf("ACE '%s': bad named flags entry at '%s'\n",
-                               orig_str, tok);
-                       SAFE_FREE(str);
-                       TALLOC_FREE(frame);
-                       return False;
-               }
-       } else if (strnequal(tok, "0x", 2)) {
-               if (!sscanf(tok, "%x", &aflags)) {
-                       printf("ACE '%s': bad hex flags entry at '%s'\n",
-                               orig_str, tok);
-                       SAFE_FREE(str);
-                       TALLOC_FREE(frame);
-                       return False;
+       if (domain_sid) {
+               if (!dom_sid_parse(domain_sid, sid)) {
+                       DEBUG(0,("failed to parse domain sid\n"));
+                       TALLOC_FREE(sid);
                }
        } else {
-               if (!sscanf(tok, "%i", &aflags)) {
-                       printf("ACE '%s': bad integer flags entry at '%s'\n",
-                               orig_str, tok);
-                       SAFE_FREE(str);
-                       TALLOC_FREE(frame);
-                       return False;
-               }
-       }
-
-       if (!next_token_talloc(frame, &cp, &tok, "/")) {
-               printf("ACE '%s': missing / at '%s'\n",
-                       orig_str, tok);
-               SAFE_FREE(str);
-               TALLOC_FREE(frame);
-               return False;
-       }
+               status = cli_lsa_lookup_domain_sid(cli, sid);
 
-       if (strncmp(tok, "0x", 2) == 0) {
-               if (sscanf(tok, "%i", &amask) != 1) {
-                       printf("ACE '%s': bad hex number at '%s'\n",
-                               orig_str, tok);
-                       SAFE_FREE(str);
-                       TALLOC_FREE(frame);
-                       return False;
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("failed to lookup domain sid: %s\n", nt_errstr(status)));
+                       TALLOC_FREE(sid);
                }
-               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) {
-                       printf("ACE '%s': bad permission value at '%s'\n",
-                               orig_str, p);
-                       SAFE_FREE(str);
-                       TALLOC_FREE(frame);
-                       return False;
-               }
-               p++;
-       }
-
-       if (*p) {
-               TALLOC_FREE(frame);
-               SAFE_FREE(str);
-               return False;
-       }
-
- done:
-       mask = amask;
-       init_sec_ace(ace, &sid, atype, mask, aflags);
-       TALLOC_FREE(frame);
-       SAFE_FREE(str);
-       return True;
+       DEBUG(2,("Domain SID: %s\n", sid_string_dbg(sid)));
+       return sid;
 }
 
-/* add an ACE to a list of ACEs in a SEC_ACL */
-static bool add_ace(SEC_ACL **the_acl, SEC_ACE *ace)
+/* add an ACE to a list of ACEs in a struct security_acl */
+static bool add_ace(struct security_acl **the_acl, struct security_ace *ace)
 {
-       SEC_ACL *new_ace;
-       SEC_ACE *aces;
+       struct security_acl *new_ace;
+       struct security_ace *aces;
        if (! *the_acl) {
                return (((*the_acl) = make_sec_acl(talloc_tos(), 3, 1, ace))
                        != NULL);
        }
 
-       if (!(aces = SMB_CALLOC_ARRAY(SEC_ACE, 1+(*the_acl)->num_aces))) {
+       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(SEC_ACE));
-       memcpy(aces+(*the_acl)->num_aces, ace, sizeof(SEC_ACE));
+       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(talloc_tos(),(*the_acl)->revision,1+(*the_acl)->num_aces, aces);
        SAFE_FREE(aces);
        (*the_acl) = new_ace;
@@ -546,14 +145,14 @@ static bool add_ace(SEC_ACL **the_acl, SEC_ACE *ace)
 }
 
 /* parse a ascii version of a security descriptor */
-static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *str)
+static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *str)
 {
        const char *p = str;
        char *tok;
-       SEC_DESC *ret = NULL;
+       struct security_descriptor *ret = NULL;
        size_t sd_size;
-       DOM_SID *grp_sid=NULL, *owner_sid=NULL;
-       SEC_ACL *dacl=NULL;
+       struct dom_sid *grp_sid=NULL, *owner_sid=NULL;
+       struct security_acl *dacl=NULL;
        int revision=1;
 
        while (next_token_talloc(ctx, &p, &tok, "\t,\r\n")) {
@@ -567,7 +166,7 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st
                                printf("Only specify owner once\n");
                                goto done;
                        }
-                       owner_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+                       owner_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
                        if (!owner_sid ||
                            !StringToSid(cli, owner_sid, tok+6)) {
                                printf("Failed to parse owner sid\n");
@@ -581,7 +180,7 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st
                                printf("Only specify group once\n");
                                goto done;
                        }
-                       grp_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+                       grp_sid = SMB_CALLOC_ARRAY(struct dom_sid, 1);
                        if (!grp_sid ||
                            !StringToSid(cli, grp_sid, tok+6)) {
                                printf("Failed to parse group sid\n");
@@ -591,7 +190,7 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st
                }
 
                if (strncmp(tok,"ACL:", 4) == 0) {
-                       SEC_ACE ace;
+                       struct security_ace ace;
                        if (!parse_ace(cli, &ace, tok+4)) {
                                goto done;
                        }
@@ -616,79 +215,177 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st
        return ret;
 }
 
-
-/* print a ascii version of a security descriptor on a FILE handle */
-static void sec_desc_print(struct cli_state *cli, FILE *f, SEC_DESC *sd)
+/*****************************************************
+get fileinfo for filename
+*******************************************************/
+static uint16_t get_fileinfo(struct cli_state *cli, const char *filename)
 {
-       fstring sidstr;
-       uint32 i;
-
-       fprintf(f, "REVISION:%d\n", sd->revision);
-       fprintf(f, "CONTROL:0x%x\n", sd->type);
+       uint16_t fnum = (uint16_t)-1;
+       uint16_t mode = 0;
+       NTSTATUS status;
 
-       /* Print owner and group sid */
+       /* The desired access below is the only one I could find that works
+          with NT4, W2KP and Samba */
 
-       if (sd->owner_sid) {
-               SidToString(cli, sidstr, sd->owner_sid);
-       } else {
-               fstrcpy(sidstr, "");
+       status = cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ,
+                             0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                             FILE_OPEN, 0x0, 0x0, &fnum, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to open %s: %s\n", filename, nt_errstr(status));
+               return 0;
        }
 
-       fprintf(f, "OWNER:%s\n", sidstr);
+       status = cli_qfileinfo_basic(cli, fnum, &mode, NULL, NULL, NULL,
+                                    NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to file info %s: %s\n", filename,
+                      nt_errstr(status));
+        }
+
+       cli_close(cli, fnum);
+
+        return mode;
+}
+
+/*****************************************************
+get sec desc for filename
+*******************************************************/
+static struct security_descriptor *get_secdesc(struct cli_state *cli, const char *filename)
+{
+       uint16_t fnum = (uint16_t)-1;
+       struct security_descriptor *sd;
+       NTSTATUS status;
+       uint32_t sec_info;
+       uint32_t desired_access = 0;
 
-       if (sd->group_sid) {
-               SidToString(cli, sidstr, sd->group_sid);
+       if (query_sec_info == -1) {
+               sec_info = SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL;
        } else {
-               fstrcpy(sidstr, "");
+               sec_info = query_sec_info;
        }
 
-       fprintf(f, "GROUP:%s\n", sidstr);
+       if (sec_info & (SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL)) {
+               desired_access |= SEC_STD_READ_CONTROL;
+       }
+       if (sec_info & SECINFO_SACL) {
+               desired_access |= SEC_FLAG_SYSTEM_SECURITY;
+       }
 
-       /* Print aces */
-       for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
-               SEC_ACE *ace = &sd->dacl->aces[i];
-               fprintf(f, "ACL:");
-               print_ace(cli, f, ace);
-               fprintf(f, "\n");
+       if (desired_access == 0) {
+               desired_access |= SEC_STD_READ_CONTROL;
+       }
+
+       status = cli_ntcreate(cli, filename, 0, desired_access,
+                             0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                             FILE_OPEN, 0x0, 0x0, &fnum, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to open %s: %s\n", filename, nt_errstr(status));
+               return NULL;
        }
 
+       status = cli_query_security_descriptor(cli, fnum, sec_info,
+                                              talloc_tos(), &sd);
+
+       cli_close(cli, fnum);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to get security descriptor: %s\n",
+                      nt_errstr(status));
+               return NULL;
+       }
+        return sd;
 }
 
-/***************************************************** 
-dump the acls for a file
+/*****************************************************
+set sec desc for filename
 *******************************************************/
-static int cacl_dump(struct cli_state *cli, char *filename)
+static bool set_secdesc(struct cli_state *cli, const char *filename,
+                        struct security_descriptor *sd)
 {
-       int result = EXIT_FAILED;
-       int fnum = -1;
-       SEC_DESC *sd;
+       uint16_t fnum = (uint16_t)-1;
+        bool result=true;
+       NTSTATUS status;
+       uint32_t desired_access = 0;
+       uint32_t sec_info;
 
-       if (test_args) 
-               return EXIT_OK;
+       if (set_sec_info == -1) {
+               sec_info = 0;
 
-       fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+               if (sd->dacl || (sd->type & SEC_DESC_DACL_PRESENT)) {
+                       sec_info |= SECINFO_DACL;
+               }
+               if (sd->sacl || (sd->type & SEC_DESC_SACL_PRESENT)) {
+                       sec_info |= SECINFO_SACL;
+               }
+               if (sd->owner_sid) {
+                       sec_info |= SECINFO_OWNER;
+               }
+               if (sd->group_sid) {
+                       sec_info |= SECINFO_GROUP;
+               }
+       } else {
+               sec_info = set_sec_info;
+       }
 
-       if (fnum == -1) {
-               printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
-               goto done;
+       /* Make the desired_access more specific. */
+       if (sec_info & SECINFO_DACL) {
+               desired_access |= SEC_STD_WRITE_DAC;
+       }
+       if (sec_info & SECINFO_SACL) {
+               desired_access |= SEC_FLAG_SYSTEM_SECURITY;
+       }
+       if (sec_info & (SECINFO_OWNER | SECINFO_GROUP)) {
+               desired_access |= SEC_STD_WRITE_OWNER;
        }
 
-       sd = cli_query_secdesc(cli, fnum, talloc_tos());
+       status = cli_ntcreate(cli, filename, 0,
+                             desired_access,
+                             0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                             FILE_OPEN, 0x0, 0x0, &fnum, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to open %s: %s\n", filename, nt_errstr(status));
+               return false;
+       }
 
-       if (!sd) {
-               printf("ERROR: secdesc query failed: %s\n", cli_errstr(cli));
-               goto done;
+       status = cli_set_security_descriptor(cli, fnum, sec_info, sd);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ERROR: security description set failed: %s\n",
+                       nt_errstr(status));
+               result=false;
        }
 
-       sec_desc_print(cli, stdout, sd);
+       cli_close(cli, fnum);
+       return result;
+}
+
+/*****************************************************
+dump the acls for a file
+*******************************************************/
+static int cacl_dump(struct cli_state *cli, const char *filename, bool numeric)
+{
+       struct security_descriptor *sd;
+
+       if (test_args) {
+               return EXIT_OK;
+       }
 
-       result = EXIT_OK;
+       sd = get_secdesc(cli, filename);
+       if (sd == NULL) {
+               return EXIT_FAILED;
+       }
 
-done:
-       if (fnum != -1)
-               cli_close(cli, fnum);
+       if (sddl) {
+               char *str = sddl_encode(talloc_tos(), sd, get_domain_sid(cli));
+               if (str == NULL) {
+                       return EXIT_FAILED;
+               }
+               printf("%s\n", str);
+               TALLOC_FREE(str);
+       } else {
+               sec_desc_print(cli, stdout, sd, numeric);
+       }
 
-       return result;
+       return EXIT_OK;
 }
 
 /***************************************************** 
@@ -699,50 +396,28 @@ because the NT docs say this can't be done :-). JRA.
 static int owner_set(struct cli_state *cli, enum chown_mode change_mode, 
                        const char *filename, const char *new_username)
 {
-       int fnum;
-       DOM_SID sid;
-       SEC_DESC *sd, *old;
+       struct dom_sid sid;
+       struct security_descriptor *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(cli, &sid, new_username))
                return EXIT_PARSE_ERROR;
 
-       old = cli_query_secdesc(cli, fnum, talloc_tos());
-
-       cli_close(cli, fnum);
+       old = get_secdesc(cli, filename);
 
        if (!old) {
-               printf("owner_set: Failed to query old descriptor\n");
                return EXIT_FAILED;
        }
 
-       sd = make_sec_desc(talloc_tos(),old->revision, old->type,
+       sd = make_sec_desc(talloc_tos(),old->revision, SEC_DESC_SELF_RELATIVE,
                                (change_mode == REQUEST_CHOWN) ? &sid : NULL,
                                (change_mode == REQUEST_CHGRP) ? &sid : NULL,
                           NULL, NULL, &sd_size);
 
-       fnum = cli_nt_create(cli, filename, WRITE_OWNER_ACCESS);
-
-       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);
+       if (!set_secdesc(cli, filename, sd)) {
                return EXIT_FAILED;
        }
 
-       cli_close(cli, fnum);
-
        return EXIT_OK;
 }
 
@@ -755,9 +430,9 @@ static int owner_set(struct cli_state *cli, enum chown_mode change_mode,
    canonical order is specified as "Explicit Deny, Explicit Allow,
    Inherited ACEs unchanged" */
 
-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))
+       if (security_ace_equal(ace1, ace2))
                return 0;
 
        if ((ace1->flags & SEC_ACE_FLAG_INHERITED_ACE) &&
@@ -773,8 +448,8 @@ static int ace_compare(SEC_ACE *ace1, SEC_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;
@@ -785,18 +460,19 @@ static int ace_compare(SEC_ACE *ace1, SEC_ACE *ace2)
        if (ace1->size != ace2->size)
                return ace1->size - ace2->size;
 
-       return memcmp(ace1, ace2, sizeof(SEC_ACE));
+       return memcmp(ace1, ace2, sizeof(struct security_ace));
 }
 
-static void sort_acl(SEC_ACL *the_acl)
+static void sort_acl(struct security_acl *the_acl)
 {
-       uint32 i;
+       uint32_t 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;) {
-               if (sec_ace_equal(&the_acl->aces[i-1], &the_acl->aces[i])) {
+               if (security_ace_equal(&the_acl->aces[i-1],
+                                      &the_acl->aces[i])) {
                        int j;
                        for (j=i; j<the_acl->num_aces-1; j++) {
                                the_acl->aces[j] = the_acl->aces[j+1];
@@ -812,39 +488,35 @@ static void sort_acl(SEC_ACL *the_acl)
 set the ACLs on a file given an ascii description
 *******************************************************/
 
-static int cacl_set(struct cli_state *cli, char *filename, 
-                   char *the_acl, enum acl_mode mode)
+static int cacl_set(struct cli_state *cli, const char *filename,
+                   char *the_acl, enum acl_mode mode, bool numeric)
 {
-       int fnum;
-       SEC_DESC *sd, *old;
-       uint32 i, j;
+       struct security_descriptor *sd, *old;
+       uint32_t i, j;
        size_t sd_size;
        int result = EXIT_OK;
 
-       sd = sec_desc_parse(talloc_tos(), cli, the_acl);
+       if (sddl) {
+               sd = sddl_decode(talloc_tos(), the_acl, get_domain_sid(cli));
+       } else {
+               sd = sec_desc_parse(talloc_tos(), cli, 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);
-
-       if (fnum == -1) {
-               printf("cacl_set failed to open %s: %s\n", filename, cli_errstr(cli));
-               return EXIT_FAILED;
-       }
+       if (mode != SMB_ACL_SET) {
+               /*
+                * Do not fetch old ACL when it will be overwritten
+                * completely with a new one.
+                */
+               old = get_secdesc(cli, filename);
 
-       old = cli_query_secdesc(cli, fnum, talloc_tos());
-
-       if (!old) {
-               printf("calc_set: Failed to query old descriptor\n");
-               return EXIT_FAILED;
+               if (!old) {
+                       return EXIT_FAILED;
+               }
        }
 
-       cli_close(cli, fnum);
-
        /* the logic here is rather more complex than I would like */
        switch (mode) {
        case SMB_ACL_DELETE:
@@ -852,9 +524,9 @@ static int cacl_set(struct cli_state *cli, char *filename,
                        bool found = False;
 
                        for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
-                               if (sec_ace_equal(&sd->dacl->aces[i],
-                                                 &old->dacl->aces[j])) {
-                                       uint32 k;
+                               if (security_ace_equal(&sd->dacl->aces[i],
+                                                      &old->dacl->aces[j])) {
+                                       uint32_t k;
                                        for (k=j; k<old->dacl->num_aces-1;k++) {
                                                old->dacl->aces[k] = old->dacl->aces[k+1];
                                        }
@@ -866,7 +538,8 @@ static int cacl_set(struct cli_state *cli, char *filename,
 
                        if (!found) {
                                printf("ACL for ACE:");
-                               print_ace(cli, stdout, &sd->dacl->aces[i]);
+                               print_ace(cli, stdout, &sd->dacl->aces[i],
+                                         numeric);
                                printf(" not found\n");
                        }
                }
@@ -877,7 +550,7 @@ static int cacl_set(struct cli_state *cli, char *filename,
                        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;
@@ -888,7 +561,8 @@ static int cacl_set(struct cli_state *cli, char *filename,
                                fstring str;
 
                                SidToString(cli, str,
-                                           &sd->dacl->aces[i].trustee);
+                                           &sd->dacl->aces[i].trustee,
+                                           numeric);
                                printf("ACL for SID %s not found\n", str);
                        }
                }
@@ -930,60 +604,155 @@ static int cacl_set(struct cli_state *cli, char *filename,
                           old->owner_sid, old->group_sid,
                           NULL, old->dacl, &sd_size);
 
-       fnum = cli_nt_create(cli, filename, WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS);
+       if (!set_secdesc(cli, filename, sd)) {
+               result = EXIT_FAILED;
+       }
+
+       return result;
+}
 
-       if (fnum == -1) {
-               printf("cacl_set failed to open %s: %s\n", filename, cli_errstr(cli));
+/*****************************************************
+set the inherit on a file
+*******************************************************/
+static int inherit(struct cli_state *cli, const char *filename,
+                   const char *type)
+{
+       struct security_descriptor *old,*sd;
+       uint32_t oldattr;
+       size_t sd_size;
+       int result = EXIT_OK;
+
+       old = get_secdesc(cli, filename);
+
+       if (!old) {
                return EXIT_FAILED;
        }
 
-       if (!cli_set_secdesc(cli, fnum, sd)) {
-               printf("ERROR: secdesc set failed: %s\n", cli_errstr(cli));
-               result = EXIT_FAILED;
+        oldattr = get_fileinfo(cli,filename);
+
+       if (strcmp(type,"allow")==0) {
+               if ((old->type & SEC_DESC_DACL_PROTECTED) ==
+                    SEC_DESC_DACL_PROTECTED) {
+                       int i;
+                       char *parentname,*temp;
+                       struct security_descriptor *parent;
+                       temp = talloc_strdup(talloc_tos(), filename);
+
+                       old->type=old->type & (~SEC_DESC_DACL_PROTECTED);
+
+                       /* look at parent and copy in all its inheritable ACL's. */
+                       string_replace(temp, '\\', '/');
+                       if (!parent_dirname(talloc_tos(),temp,&parentname,NULL)) {
+                               return EXIT_FAILED;
+                       }
+                       string_replace(parentname, '/', '\\');
+                       parent = get_secdesc(cli,parentname);
+                       if (parent == NULL) {
+                               return EXIT_FAILED;
+                       }
+                       for (i=0;i<parent->dacl->num_aces;i++) {
+                               struct security_ace *ace=&parent->dacl->aces[i];
+                               /* Add inherited flag to all aces */
+                               ace->flags=ace->flags|
+                                          SEC_ACE_FLAG_INHERITED_ACE;
+                               if ((oldattr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) {
+                                       if ((ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) ==
+                                           SEC_ACE_FLAG_CONTAINER_INHERIT) {
+                                               add_ace(&old->dacl, ace);
+                                       }
+                               } else {
+                                       if ((ace->flags & SEC_ACE_FLAG_OBJECT_INHERIT) ==
+                                           SEC_ACE_FLAG_OBJECT_INHERIT) {
+                                               /* clear flags for files */
+                                               ace->flags=0;
+                                               add_ace(&old->dacl, ace);
+                                       }
+                               }
+                       }
+                } else {
+                       printf("Already set to inheritable permissions.\n");
+                       return EXIT_FAILED;
+                }
+       } else if (strcmp(type,"remove")==0) {
+               if ((old->type & SEC_DESC_DACL_PROTECTED) !=
+                    SEC_DESC_DACL_PROTECTED) {
+                       old->type=old->type | SEC_DESC_DACL_PROTECTED;
+
+                       /* remove all inherited ACL's. */
+                       if (old->dacl) {
+                               int i;
+                               struct security_acl *temp=old->dacl;
+                               old->dacl=make_sec_acl(talloc_tos(), 3, 0, NULL);
+                               for (i=temp->num_aces-1;i>=0;i--) {
+                                       struct security_ace *ace=&temp->aces[i];
+                                       /* Remove all ace with INHERITED flag set */
+                                       if ((ace->flags & SEC_ACE_FLAG_INHERITED_ACE) !=
+                                           SEC_ACE_FLAG_INHERITED_ACE) {
+                                               add_ace(&old->dacl,ace);
+                                       }
+                               }
+                       }
+                } else {
+                       printf("Already set to no inheritable permissions.\n");
+                       return EXIT_FAILED;
+                }
+       } else if (strcmp(type,"copy")==0) {
+               if ((old->type & SEC_DESC_DACL_PROTECTED) !=
+                    SEC_DESC_DACL_PROTECTED) {
+                       old->type=old->type | SEC_DESC_DACL_PROTECTED;
+
+                       /* convert all inherited ACL's to non inherated ACL's. */
+                       if (old->dacl) {
+                               int i;
+                               for (i=0;i<old->dacl->num_aces;i++) {
+                                       struct security_ace *ace=&old->dacl->aces[i];
+                                       /* Remove INHERITED FLAG from all aces */
+                                       ace->flags=ace->flags&(~SEC_ACE_FLAG_INHERITED_ACE);
+                               }
+                       }
+                } else {
+                       printf("Already set to no inheritable permissions.\n");
+                       return EXIT_FAILED;
+                }
        }
 
-       /* Clean up */
+       /* Denied ACE entries must come before allowed ones */
+       sort_acl(old->dacl);
 
-       cli_close(cli, fnum);
+       sd = make_sec_desc(talloc_tos(),old->revision, old->type,
+                          old->owner_sid, old->group_sid,
+                          NULL, old->dacl, &sd_size);
+
+       if (!set_secdesc(cli, filename, sd)) {
+               result = EXIT_FAILED;
+       }
 
        return result;
 }
 
-
 /*****************************************************
  Return a connection to a server.
 *******************************************************/
-static struct cli_state *connect_one(struct user_auth_info *auth_info,
+static struct cli_state *connect_one(const struct user_auth_info *auth_info,
                                     const char *server, const char *share)
 {
        struct cli_state *c = NULL;
-       struct sockaddr_storage ss;
        NTSTATUS nt_status;
        uint32_t flags = 0;
 
-       zero_sockaddr(&ss);
-
        if (get_cmdline_auth_info_use_kerberos(auth_info)) {
                flags |= CLI_FULL_CONNECTION_USE_KERBEROS |
                         CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
        }
 
-       if (get_cmdline_auth_info_use_machine_account(auth_info) &&
-           !set_cmdline_auth_info_machine_account_creds(auth_info)) {
-               return NULL;
-       }
-
-       set_cmdline_auth_info_getpass(auth_info);
-
-       nt_status = cli_full_connection(&c, global_myname(), server, 
-                               &ss, 0,
+       nt_status = cli_full_connection(&c, lp_netbios_name(), server,
+                               NULL, 0,
                                share, "?????",
                                get_cmdline_auth_info_username(auth_info),
                                lp_workgroup(),
                                get_cmdline_auth_info_password(auth_info),
                                flags,
-                               get_cmdline_auth_info_signing_state(auth_info),
-                               NULL);
+                               get_cmdline_auth_info_signing_state(auth_info));
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0,("cli_full_connection failed! (%s)\n", nt_errstr(nt_status)));
                return NULL;
@@ -1007,8 +776,9 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
 /****************************************************************************
   main program
 ****************************************************************************/
- int main(int argc, const char *argv[])
+int main(int argc, char *argv[])
 {
+       const char **argv_const = discard_const_p(const char *, argv);
        char *share;
        int opt;
        enum acl_mode mode = SMB_ACL_SET;
@@ -1018,6 +788,10 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
        char *path;
        char *filename = NULL;
        poptContext pc;
+       /* numeric is set when the user wants numeric SIDs and ACEs rather
+          than going via LSA calls to resolve them */
+       int numeric = 0;
+
        struct poptOption long_options[] = {
                POPT_AUTOHELP
                { "delete", 'D', POPT_ARG_STRING, NULL, 'D', "Delete an acl", "ACL" },
@@ -1026,8 +800,18 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
                { "set", 'S', POPT_ARG_STRING, NULL, 'S', "Set acls", "ACLS" },
                { "chown", 'C', POPT_ARG_STRING, NULL, 'C', "Change ownership of a file", "USERNAME" },
                { "chgrp", 'G', POPT_ARG_STRING, NULL, 'G', "Change group ownership of a file", "GROUPNAME" },
+               { "inherit", 'I', POPT_ARG_STRING, NULL, 'I', "Inherit allow|remove|copy" },
                { "numeric", 0, POPT_ARG_NONE, &numeric, 1, "Don't resolve sids or masks to names" },
+               { "sddl", 0, POPT_ARG_NONE, &sddl, 1, "Output and input acls in sddl format" },
+               { "query-security-info", 0, POPT_ARG_INT, &query_sec_info, 1,
+                 "The security-info flags for queries"
+               },
+               { "set-security-info", 0, POPT_ARG_INT, &set_sec_info, 1,
+                 "The security-info flags for modifications"
+               },
                { "test-args", 't', POPT_ARG_NONE, &test_args, 1, "Test arguments"},
+               { "domain-sid", 0, POPT_ARG_STRING, &domain_sid, 0, "Domain SID for sddl", "SID"},
+               { "max-protocol", 'm', POPT_ARG_STRING, NULL, 'm', "Set the max protocol level", "LEVEL" },
                POPT_COMMON_SAMBA
                POPT_COMMON_CONNECTION
                POPT_COMMON_CREDENTIALS
@@ -1038,29 +822,18 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
        TALLOC_CTX *frame = talloc_stackframe();
        const char *owner_username = "";
        char *server;
-       struct user_auth_info *auth_info;
-
-       load_case_tables();
 
+       smb_init_locale();
 
        /* set default debug level to 1 regardless of what smb.conf sets */
-       setup_logging( "smbcacls", True );
-       DEBUGLEVEL_CLASS[DBGC_ALL] = 1;
-       dbf = x_stderr;
-       x_setbuf( x_stderr, NULL );
+       setup_logging( "smbcacls", DEBUG_STDERR);
+       lp_set_cmdline("log level", "1");
 
        setlinebuf(stdout);
 
-       lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
-       load_interfaces();
+       popt_common_credentials_set_ignore_missing_conf();
 
-       auth_info = user_auth_info_init(frame);
-       if (auth_info == NULL) {
-               exit(1);
-       }
-       popt_common_set_auth_info(auth_info);
-
-       pc = poptGetContext("smbcacls", argc, argv, long_options, 0);
+       pc = poptGetContext("smbcacls", argc, argv_const, long_options, 0);
 
        poptSetOtherOptionHelp(pc, "//server1/share1 filename\nACLs look like: "
                "'ACL:user:[ALLOWED|DENIED]/flags/permissions'");
@@ -1096,6 +869,14 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
                        owner_username = poptGetOptArg(pc);
                        change_mode = REQUEST_CHGRP;
                        break;
+
+               case 'I':
+                       owner_username = poptGetOptArg(pc);
+                       change_mode = REQUEST_INHERIT;
+                       break;
+               case 'm':
+                       lp_set_cmdline("client max protocol", poptGetOptArg(pc));
+                       break;
                }
        }
 
@@ -1120,6 +901,10 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
                return -1;
        }
 
+       poptFreeContext(pc);
+       popt_burn_cmdline_password(argc, argv);
+       popt_common_credentials_post();
+
        string_replace(path,'/','\\');
 
        server = talloc_strdup(frame, path+2);
@@ -1136,11 +921,12 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
        share++;
 
        if (!test_args) {
-               cli = connect_one(auth_info, server, share);
+               cli = connect_one(popt_get_cmdline_auth_info(), server, share);
                if (!cli) {
                        exit(EXIT_FAILED);
                }
        } else {
+               popt_free_cmdline_auth_info();
                exit(0);
        }
 
@@ -1156,14 +942,17 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
 
        /* Perform requested action */
 
-       if (change_mode != REQUEST_NONE) {
+       if (change_mode == REQUEST_INHERIT) {
+               result = inherit(cli, filename, owner_username);
+       } else 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);
+               result = cacl_set(cli, filename, the_acl, mode, numeric);
        } else {
-               result = cacl_dump(cli, filename);
+               result = cacl_dump(cli, filename, numeric);
        }
 
+       popt_free_cmdline_auth_info();
        TALLOC_FREE(frame);
 
        return result;