Changeset 745 for trunk/server/source3/utils/smbcacls.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/smbcacls.c (modified) (34 diffs)

trunk/server/source3/utils/smbcacls.c

@@ -1 @@
-/* 
+/*
    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/>.
@@ -23 +23 @@
 
 #include "includes.h"
-
-extern bool AllowDebugChange;
+#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"
 
 static int test_args;
@@ -34 +40 @@
 static int numeric;
 
+static int sddl;
+
 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};
 
@@ -65 +73 @@
 
 static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
-                                   const DOM_SID *sid,
+                                   const struct dom_sid *sid,
                                    TALLOC_CTX *mem_ctx,
                                    enum lsa_SidType *type,
@@ -118 +126 @@
                                     const char *name,
                                     enum lsa_SidType *type,
-                                    DOM_SID *sid)
+                                    struct dom_sid *sid)
 {
         uint16 orig_cnum = cli->cnum;
@@ -125 +133 @@
         NTSTATUS status;
         TALLOC_CTX *frame = talloc_stackframe();
-        DOM_SID *sids;
+        struct dom_sid *sids;
         enum lsa_SidType *types;
 
@@ -164 +172 @@
 
 /* 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 void SidToString(struct cli_state *cli, fstring str, const struct dom_sid *sid)
 {
         char *domain = NULL;
@@ -193 +201 @@
 
 /* convert a string to a SID, either numeric or username/group */
-static bool StringToSid(struct cli_state *cli, DOM_SID *sid, const char *str)
+static bool StringToSid(struct cli_state *cli, struct dom_sid *sid, const char *str)
 {
         enum lsa_SidType type;
 
-        if (strncmp(str, "S-", 2) == 0) {
-                return string_to_sid(sid, str);
+        if (string_to_sid(sid, str)) {
+                return true;
         }
 
@@ -265 +273 @@
 
 /* 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)
+static void print_ace(struct cli_state *cli, FILE *f, struct security_ace *ace)
 {
         const struct perm_value *v;
@@ -353 +361 @@
                 }
 
-                if (*p != '|' && *p != '\0') {
+                switch (*p) {
+                case '|':
+                        p++;
+                case '\0':
+                        continue;
+                default:
                         return false;
                 }
@@ -361 +374 @@
 
 /* parse an ACE in the same format as print_ace() */
-static bool parse_ace(struct cli_state *cli, SEC_ACE *ace,
+static bool parse_ace(struct cli_state *cli, struct security_ace *ace,
                       const char *orig_str)
 {
@@ -370 +383 @@
         unsigned int aflags = 0;
         unsigned int amask = 0;
-        DOM_SID sid;
+        struct dom_sid sid;
         uint32_t mask;
         const struct perm_value *v;
@@ -527 +540 @@
 }
 
-/* add an ACE to a list of ACEs in a SEC_ACL */
-static bool add_ace(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(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(talloc_tos(), 3, 1, ace))
@@ -537 +550 @@
         }
 
-        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);
@@ -549 +563 @@
 
 /* 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;
 
@@ -570 +584 @@
                                 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)) {
@@ -584 +598 @@
                                 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)) {
@@ -594 +608 @@
 
                 if (strncmp(tok,"ACL:", 4) == 0) {
-                        SEC_ACE ace;
+                        struct security_ace ace;
                         if (!parse_ace(cli, &ace, tok+4)) {
                                 goto done;
@@ -621 +635 @@
 
 /* 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)
+static void sec_desc_print(struct cli_state *cli, FILE *f, struct security_descriptor *sd)
 {
         fstring sidstr;
@@ -649 +663 @@
         /* 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(cli, f, ace);
@@ -657 +671 @@
 }
 
-/***************************************************** 
+/*****************************************************
+get fileinfo for filename
+*******************************************************/
+static uint16 get_fileinfo(struct cli_state *cli, const char *filename)
+{
+        uint16_t fnum = (uint16_t)-1;
+        uint16 mode = 0;
+        NTSTATUS status;
+
+        /* The desired access below is the only one I could find that works
+           with NT4, W2KP and Samba */
+
+        status = cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ,
+                              0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                              FILE_OPEN, 0x0, 0x0, &fnum);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to open %s: %s\n", filename, nt_errstr(status));
+                return 0;
+        }
+
+        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;
+
+        /* The desired access below is the only one I could find that works
+           with NT4, W2KP and Samba */
+
+        status = cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ,
+                              0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                              FILE_OPEN, 0x0, 0x0, &fnum);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to open %s: %s\n", filename, nt_errstr(status));
+                return NULL;
+        }
+
+        sd = cli_query_secdesc(cli, fnum, talloc_tos());
+
+        cli_close(cli, fnum);
+
+        if (!sd) {
+                printf("Failed to get security descriptor\n");
+                return NULL;
+        }
+        return sd;
+}
+
+/*****************************************************
+set sec desc for filename
+*******************************************************/
+static bool set_secdesc(struct cli_state *cli, const char *filename,
+                        struct security_descriptor *sd)
+{
+        uint16_t fnum = (uint16_t)-1;
+        bool result=true;
+        NTSTATUS status;
+
+        /* The desired access below is the only one I could find that works
+           with NT4, W2KP and Samba */
+
+        status = cli_ntcreate(cli, filename, 0,
+                              WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS,
+                              0, FILE_SHARE_READ|FILE_SHARE_WRITE,
+                              FILE_OPEN, 0x0, 0x0, &fnum);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to open %s: %s\n", filename, nt_errstr(status));
+                return false;
+        }
+
+        status = cli_set_secdesc(cli, fnum, sd);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ERROR: security description set failed: %s\n",
+                       nt_errstr(status));
+                result=false;
+        }
+
+        cli_close(cli, fnum);
+        return result;
+}
+
+/*****************************************************
 dump the acls for a file
 *******************************************************/
-static int cacl_dump(struct cli_state *cli, char *filename)
+static int cacl_dump(struct cli_state *cli, const char *filename)
 {
         int result = EXIT_FAILED;
-        uint16_t fnum = (uint16_t)-1;
-        SEC_DESC *sd;
-
-        if (test_args) 
+        struct security_descriptor *sd;
+
+        if (test_args)
                 return EXIT_OK;
 
-        if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ, 0,
-                                FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
-                printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
-                goto done;
-        }
-
-        sd = cli_query_secdesc(cli, fnum, talloc_tos());
-
-        if (!sd) {
-                printf("ERROR: secdesc query failed: %s\n", cli_errstr(cli));
-                goto done;
-        }
-
-        sec_desc_print(cli, stdout, sd);
-
-        result = EXIT_OK;
-
-done:
-        if (fnum != (uint16_t)-1)
-                cli_close(cli, fnum);
+        sd = get_secdesc(cli, filename);
+
+        if (sd) {
+                if (sddl) {
+                        printf("%s\n", sddl_encode(talloc_tos(), sd,
+                                           get_global_sam_sid()));
+                } else {
+                        sec_desc_print(cli, stdout, sd);
+                }
+                result = EXIT_OK;
+        }
 
         return result;
@@ -701 +801 @@
                         const char *filename, const char *new_username)
 {
-        uint16_t fnum;
-        DOM_SID sid;
-        SEC_DESC *sd, *old;
+        struct dom_sid sid;
+        struct security_descriptor *sd, *old;
         size_t sd_size;
-
-        if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ, 0,
-                                FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
-                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;
         }
@@ -729 +819 @@
                            NULL, NULL, &sd_size);
 
-        if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0, WRITE_OWNER_ACCESS, 0,
-                        FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
-                printf("Failed to open %s: %s\n", filename, cli_errstr(cli));
+        if (!set_secdesc(cli, filename, sd)) {
                 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_FAILED;
-        }
-
-        cli_close(cli, fnum);
 
         return EXIT_OK;
@@ -755 +835 @@
    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))
@@ -773 +853 @@
                 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)
@@ -785 +865 @@
                 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;) {
@@ -812 +892 @@
 *******************************************************/
 
-static int cacl_set(struct cli_state *cli, char *filename, 
+static int cacl_set(struct cli_state *cli, const char *filename,
                     char *the_acl, enum acl_mode mode)
 {
-        uint16_t fnum;
-        SEC_DESC *sd, *old;
+        struct security_descriptor *sd, *old;
         uint32 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_global_sam_sid());
+        } 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 */
-
-        if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0, CREATE_ACCESS_READ, 0,
-                                FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
-                printf("cacl_set failed to open %s: %s\n", filename, cli_errstr(cli));
+        old = get_secdesc(cli, filename);
+
+        if (!old) {
                 return EXIT_FAILED;
         }
-
-        old = cli_query_secdesc(cli, fnum, talloc_tos());
-
-        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 */
@@ -876 +947 @@
 
                         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];
@@ -929 +1000 @@
                            NULL, old->dacl, &sd_size);
 
-        if (!NT_STATUS_IS_OK(cli_ntcreate(cli, filename, 0, WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS, 0,
-                        FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) {
-                printf("cacl_set failed to open %s: %s\n", filename, cli_errstr(cli));
+        if (!set_secdesc(cli, filename, sd)) {
+                result = EXIT_FAILED;
+        }
+
+        return result;
+}
+
+/*****************************************************
+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 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));
+        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;
+                }
+        }
+
+        /* Denied ACE entries must come before allowed ones */
+        sort_acl(old->dacl);
+
+        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;
         }
 
-        /* Clean up */
-
-        cli_close(cli, fnum);
-
         return result;
 }
-
 
 /*****************************************************
@@ -980 +1158 @@
                                 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)));
@@ -1024 +1201 @@
                 { "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" },
                 { "test-args", 't', POPT_ARG_NONE, &test_args, 1, "Test arguments"},
                 POPT_COMMON_SAMBA
@@ -1040 +1219 @@
         load_case_tables();
 
-
         /* 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 );
-        AllowDebugChange = false;
+        setup_logging( "smbcacls", DEBUG_STDERR);
+        lp_set_cmdline("log level", "1");
 
         setlinebuf(stdout);
@@ -1094 +1269 @@
                         owner_username = poptGetOptArg(pc);
                         change_mode = REQUEST_CHGRP;
+                        break;
+
+                case 'I':
+                        owner_username = poptGetOptArg(pc);
+                        change_mode = REQUEST_INHERIT;
                         break;
                 }
@@ -1155 +1335 @@
         /* 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) {