s3: remove now unneeded call to cmdline_messaging_context()
[metze/samba/wip.git] / source3 / utils / sharesec.c
index 3f66d4da6e3fc51759ef86eb721ed79238797b67..510505f00327d589c6bd620e0070057c6b7c92ee 100644 (file)
@@ -9,7 +9,7 @@
  *
  *  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 2 of the License, or
+ *  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,
  *  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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+struct cli_state;
 
 #include "includes.h"
+#include "popt_common.h"
+#include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
+#include "util_sd.h"
+#include "cmdline_contexts.h"
+
+static TALLOC_CTX *ctx;
+
+enum acl_mode { SMB_ACL_DELETE,
+               SMB_ACL_MODIFY,
+               SMB_ACL_ADD,
+               SMB_ACL_SET,
+               SMB_SD_DELETE,
+               SMB_SD_SETSDDL,
+               SMB_SD_VIEWSDDL,
+               SMB_ACL_VIEW,
+               SMB_ACL_VIEW_ALL };
 
-#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 BOOL numeric = False;
+static struct security_descriptor* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size )
+{
+       struct security_descriptor *sd = NULL;
+       struct security_ace *ace;
+       struct security_acl *theacl;
+       int num_ace;
+       const char *pacl;
+       int i;
 
-enum acl_mode {SMB_ACL_REMOVE, SMB_ACL_MODIFY, SMB_ACL_ADD, SMB_ACL_REPLACE,  SMB_ACL_VIEW };
-enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR};
+       if ( !szACL )
+               return NULL;
 
-struct perm_value {
-       const char *perm;
-       uint32 mask;
-};
+       pacl = szACL;
+       num_ace = count_chars( pacl, ',' ) + 1;
 
-/* These values discovered by inspection */
+       if ( !(ace = talloc_zero_array( mem_ctx, struct security_ace, num_ace )) )
+               return NULL;
 
-static const struct perm_value special_values[] = {
-       { "R", 0x00120089 },
-       { "W", 0x00120116 },
-       { "X", 0x001200a0 },
-       { "D", 0x00010000 },
-       { "P", 0x00040000 },
-       { "O", 0x00080000 },
-       { NULL, 0 },
-};
+       for ( i=0; i<num_ace; i++ ) {
+               char *end_acl = strchr_m( pacl, ',' );
+               fstring acl_string;
 
-static const struct perm_value standard_values[] = {
-       { "READ",   0x001200a9 },
-       { "CHANGE", 0x001301bf },
-       { "FULL",   0x001f01ff },
-       { NULL, 0 },
-};
+               strncpy( acl_string, pacl, MIN( PTR_DIFF( end_acl, pacl ), sizeof(fstring)-1) );
+               acl_string[MIN( PTR_DIFF( end_acl, pacl ), sizeof(fstring)-1)] = '\0';
 
-/********************************************************************
- print an ACE on a FILE, using either numeric or ascii representation
-********************************************************************/
+               if ( !parse_ace(NULL, &ace[i], acl_string ) )
+                       return NULL;
 
-static void print_ace(FILE *f, SEC_ACE *ace)
-{
-       const struct perm_value *v;
-       fstring sidstr;
-       int do_print = 0;
-       uint32 got_mask;
+               pacl = end_acl;
+               pacl++;
+       }
 
-       sid_to_string(sidstr, &ace->trustee);
+       if ( !(theacl = make_sec_acl( mem_ctx, NT4_ACL_REVISION, num_ace, ace )) )
+               return NULL;
 
-       fprintf(f, "%s:", sidstr);
+       sd = make_sec_desc( mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
+               NULL, NULL, NULL, theacl, sd_size);
 
-       if (numeric) {
-               fprintf(f, "%d/%d/0x%08x", 
-                       ace->type, ace->flags, ace->info.mask);
-               return;
-       }
+       return sd;
+}
 
-       /* Ace type */
+/* add an ACE to a list of ACEs in a struct security_acl */
+static bool add_ace(TALLOC_CTX *mem_ctx, struct security_acl **the_acl, struct security_ace *ace)
+{
+       struct security_acl *new_ace;
+       struct security_ace *aces;
+       if (! *the_acl) {
+               return (((*the_acl) = make_sec_acl(mem_ctx, 3, 1, ace)) != NULL);
+       }
 
-       if (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);
+       if (!(aces = SMB_CALLOC_ARRAY(struct security_ace, 1+(*the_acl)->num_aces))) {
+               return False;
        }
+       memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(struct
+       security_ace));
+       memcpy(aces+(*the_acl)->num_aces, ace, sizeof(struct security_ace));
+       new_ace = make_sec_acl(mem_ctx,(*the_acl)->revision,1+(*the_acl)->num_aces, aces);
+       SAFE_FREE(aces);
+       (*the_acl) = new_ace;
+       return True;
+}
 
-       /* Not sure what flags can be set in a file ACL */
+/* 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. */
 
-       fprintf(f, "/%d/", ace->flags);
+static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
+{
+       if (security_ace_equal(ace1, ace2))
+               return 0;
 
-       /* Standard permissions */
+       if (ace1->type != ace2->type)
+               return ace2->type - ace1->type;
 
-       for (v = standard_values; v->perm; v++) {
-               if (ace->info.mask == v->mask) {
-                       fprintf(f, "%s", v->perm);
-                       return;
-               }
-       }
+       if (dom_sid_compare(&ace1->trustee, &ace2->trustee))
+               return dom_sid_compare(&ace1->trustee, &ace2->trustee);
 
-       /* Special permissions.  Print out a hex value if we have
-          leftover bits in the mask. */
+       if (ace1->flags != ace2->flags)
+               return ace1->flags - ace2->flags;
 
-       got_mask = ace->info.mask;
+       if (ace1->access_mask != ace2->access_mask)
+               return ace1->access_mask - ace2->access_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 (ace1->size != ace2->size)
+               return ace1->size - ace2->size;
+
+       return memcmp(ace1, ace2, sizeof(struct security_ace));
+}
 
-       if (!do_print) {
-               if (got_mask != 0) {
-                       fprintf(f, "0x%08x", ace->info.mask);
+static void sort_acl(struct security_acl *the_acl)
+{
+       uint32_t i;
+       if (!the_acl) return;
+
+       TYPESAFE_QSORT(the_acl->aces, the_acl->num_aces, ace_compare);
+
+       for (i=1;i<the_acl->num_aces;) {
+               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];
+                       }
+                       the_acl->num_aces--;
                } else {
-                       do_print = 1;
-                       goto again;
+                       i++;
                }
        }
 }
 
-/********************************************************************
- print a ascii version of a security descriptor on a FILE handle
-********************************************************************/
 
-static void sec_desc_print(FILE *f, SEC_DESC *sd)
+static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *the_acl, enum acl_mode mode)
 {
-       fstring sidstr;
-       uint32 i;
-
-       fprintf(f, "REVISION:%d\n", sd->revision);
+       struct security_descriptor *sd = NULL;
+       struct security_descriptor *old = NULL;
+       size_t sd_size = 0;
+       uint32_t i, j;
 
-       /* Print owner and group sid */
+       if (mode != SMB_ACL_SET && mode != SMB_SD_DELETE) {
+           if (!(old = get_share_security( mem_ctx, sharename, &sd_size )) ) {
+               fprintf(stderr, "Unable to retrieve permissions for share "
+                       "[%s]\n", sharename);
+               return -1;
+           }
+       }
 
-       if (sd->owner_sid) {
-               sid_to_string(sidstr, sd->owner_sid);
-       } else {
-               fstrcpy(sidstr, "");
+       if ( (mode != SMB_ACL_VIEW && mode != SMB_SD_DELETE) &&
+           !(sd = parse_acl_string(mem_ctx, the_acl, &sd_size )) ) {
+               fprintf( stderr, "Failed to parse acl\n");
+               return -1;
        }
 
-       fprintf(f, "OWNER:%s\n", sidstr);
+       switch (mode) {
+       case SMB_ACL_VIEW_ALL:
+               /* should not happen */
+               return 0;
+       case SMB_ACL_VIEW:
+               sec_desc_print(NULL, stdout, old, false);
+               return 0;
+       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 (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];
+                       }
+                       old->dacl->num_aces--;
+                       found = True;
+                       break;
+                   }
+               }
+
+               if (!found) {
+                       printf("ACL for ACE:");
+                       print_ace(NULL, stdout, &sd->dacl->aces[i], false);
+                       printf(" not found\n");
+               }
+           }
+           break;
+       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 (dom_sid_equal(&sd->dacl->aces[i].trustee,
+                       &old->dacl->aces[j].trustee)) {
+                       old->dacl->aces[j] = sd->dacl->aces[i];
+                       found = True;
+                   }
+               }
 
-       if (sd->grp_sid) {
-               sid_to_string(sidstr, sd->grp_sid);
-       } else {
-               fstrcpy(sidstr, "");
+               if (!found) {
+                   struct dom_sid_buf buf;
+                   printf("ACL for SID %s not found\n",
+                          dom_sid_str_buf(&sd->dacl->aces[i].trustee, &buf));
+               }
+           }
+
+           if (sd->owner_sid) {
+               old->owner_sid = sd->owner_sid;
+           }
+
+           if (sd->group_sid) {
+               old->group_sid = sd->group_sid;
+           }
+           break;
+       case SMB_ACL_ADD:
+           for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
+               add_ace(mem_ctx, &old->dacl, &sd->dacl->aces[i]);
+           }
+           break;
+       case SMB_ACL_SET:
+           old = sd;
+           break;
+       case SMB_SD_DELETE:
+           if (!delete_share_security(sharename)) {
+               fprintf( stderr, "Failed to delete security descriptor for "
+                        "share [%s]\n", sharename );
+               return -1;
+           }
+           return 0;
+       default:
+               fprintf(stderr, "invalid command\n");
+               return -1;
        }
 
-       fprintf(f, "GROUP:%s\n", sidstr);
+       /* Denied ACE entries must come before allowed ones */
+       sort_acl(old->dacl);
 
-       /* Print aces */
-       for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
-               SEC_ACE *ace = &sd->dacl->ace[i];
-               fprintf(f, "ACL:");
-               print_ace(f, ace);
-               fprintf(f, "\n");
+       if ( !set_share_security( sharename, old ) ) {
+           fprintf( stderr, "Failed to store acl for share [%s]\n", sharename );
+           return 2;
        }
-
+       return 0;
 }
 
-/********************************************************************
-********************************************************************/
-
-static BOOL parse_ace( TALLOC_CTX *ctx, SEC_ACE *ace, char *entry )
+static int set_sharesec_sddl(const char *sharename, const char *sddl)
 {
-       SEC_ACCESS sa;
-       char *p = strchr_m( entry, ':' );
-       DOM_SID sid;
-       uint32 mask;
-       
-       if ( !p )
-               return False;
-               
-       *p = '\0';
-       p++;
-       
-       string_to_sid( &sid, entry );
-       
-       switch ( *p ) {
-               case 'F':
-               case 'f':
-                       mask = GENERIC_RIGHTS_FILE_ALL_ACCESS|STD_RIGHT_ALL_ACCESS;
-                       break;
+       struct security_descriptor *sd;
+       bool ret;
 
-               case 'R':
-               case 'r':
-                       mask = GENERIC_RIGHTS_FILE_READ|GENERIC_RIGHTS_FILE_EXECUTE|\
-                               STANDARD_RIGHTS_READ_ACCESS|STANDARD_RIGHTS_EXECUTE_ACCESS;
-                       break;
+       sd = sddl_decode(talloc_tos(), sddl, get_global_sam_sid());
+       if (sd == NULL) {
+               fprintf(stderr, "Failed to parse acl\n");
+               return -1;
+       }
 
-               default:
-                       return False;
+       ret = set_share_security(sharename, sd);
+       TALLOC_FREE(sd);
+       if (!ret) {
+               fprintf(stderr, "Failed to store acl for share [%s]\n",
+                       sharename);
+               return -1;
        }
-       
-       init_sec_access( &sa, mask );
 
-       /* no flags on share permissions */
-       init_sec_ace( ace, &sid, SEC_ACE_TYPE_ACCESS_ALLOWED, sa, 0 );
-       
-       return True;
+       return 0;
 }
 
-
-/********************************************************************
-********************************************************************/
-
-static SEC_DESC* parse_acl_string( TALLOC_CTX *ctx, const char *szACL, size_t *sd_size )
+static int view_sharesec_sddl(const char *sharename)
 {
-       SEC_DESC *sd = NULL;
-       SEC_ACE *ace;
-       SEC_ACL *acl;
-       int num_ace;
-       const char *pacl;
-       int i;
-       
-       if ( !szACL )
-               return NULL;
-
-       pacl = szACL;
-       num_ace = count_chars( pacl, ',' ) + 1;
-       
-       if ( !(ace = TALLOC_ZERO_ARRAY( ctx, SEC_ACE, num_ace )) ) 
-               return NULL;
-       
-       for ( i=0; i<num_ace; i++ ) {
-               char *end_acl = strchr_m( pacl, ',' );
-               fstring acl_string;
-
-               strncpy( acl_string, pacl, MIN( PTR_DIFF( end_acl, pacl ), sizeof(fstring)-1) );
-               acl_string[MIN( PTR_DIFF( end_acl, pacl ), sizeof(fstring)-1)] = '\0';
-               
-               if ( !parse_ace( ctx, &ace[i], acl_string ) )
-                       return NULL;
-
-               pacl = end_acl;
-               pacl++;
+       struct security_descriptor *sd;
+       size_t sd_size;
+       char *acl;
+
+       sd = get_share_security(talloc_tos(), sharename, &sd_size);
+       if (sd == NULL) {
+               fprintf(stderr, "Unable to retrieve permissions for share "
+                       "[%s]\n", sharename);
+               return -1;
        }
-       
-       if ( !(acl = make_sec_acl( ctx, NT4_ACL_REVISION, num_ace, ace )) )
-               return NULL;
-               
-       sd = make_sec_desc( ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, 
-               &global_sid_Builtin_Administrators,
-               &global_sid_Builtin_Administrators,
-               NULL, acl, sd_size);
 
-       return sd;
+       acl = sddl_encode(talloc_tos(), sd, get_global_sam_sid());
+       TALLOC_FREE(sd);
+       if (acl == NULL) {
+               fprintf(stderr, "Unable to sddl-encode permissions for share "
+                       "[%s]\n", sharename);
+               return -1;
+       }
+       printf("%s\n", acl);
+       TALLOC_FREE(acl);
+       return 0;
 }
 
 /********************************************************************
   main program
 ********************************************************************/
 
+enum {
+       OPT_VIEW_ALL = 1000,
+};
+
 int main(int argc, const char *argv[])
 {
        int opt;
-       enum acl_mode mode = SMB_ACL_REPLACE;
+       int retval = 0;
+       enum acl_mode mode = SMB_ACL_SET;
        static char *the_acl = NULL;
        fstring sharename;
-       BOOL force_acl = False;
-       size_t sd_size = 0;
-       SEC_DESC *secdesc;
+       bool force_acl = False;
        int snum;
        poptContext pc;
-       TALLOC_CTX *ctx;
-       BOOL initialize_sid = False;
+       bool initialize_sid = False;
        struct poptOption long_options[] = {
                POPT_AUTOHELP
-#if 0
-               { "remove", 'r', POPT_ARG_STRING, NULL, 'r', "Delete an ACE", "ACL" },
-               { "modify", 'm', POPT_ARG_STRING, NULL, 'm', "Modify an acl", "ACL" },
-               { "add", 'a', POPT_ARG_STRING, NULL, 'a', "Add an ACE", "ACL" },
-#endif
-               { "replace", 'R', POPT_ARG_STRING, NULL, 'R', "Set share mission ACL", "ACLS" },
-               { "view", 'v', POPT_ARG_NONE, NULL, 'v', "View current share permissions" },
-               { "machine-sid", 'M', POPT_ARG_NONE, NULL, 'M', "Initialize the machine SID" },
-               { "force", 'F', POPT_ARG_NONE, NULL, 'F', "Force storing the ACL", "ACLS" },
+               {
+                       .longName   = "remove",
+                       .shortName  = 'r',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = &the_acl,
+                       .val        = 'r',
+                       .descrip    = "Remove ACEs",
+                       .argDescrip = "ACL",
+               },
+               {
+                       .longName   = "modify",
+                       .shortName  = 'm',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = &the_acl,
+                       .val        = 'm',
+                       .descrip    = "Modify existing ACEs",
+                       .argDescrip = "ACL",
+               },
+               {
+                       .longName   = "add",
+                       .shortName  = 'a',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = &the_acl,
+                       .val        = 'a',
+                       .descrip    = "Add ACEs",
+                       .argDescrip = "ACL",
+               },
+               {
+                       .longName   = "replace",
+                       .shortName  = 'R',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = &the_acl,
+                       .val        = 'R',
+                       .descrip    = "Overwrite share permission ACL",
+                       .argDescrip = "ACLS",
+               },
+               {
+                       .longName   = "delete",
+                       .shortName  = 'D',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'D',
+                       .descrip    = "Delete the entire security descriptor",
+               },
+               {
+                       .longName   = "setsddl",
+                       .shortName  = 'S',
+                       .argInfo    = POPT_ARG_STRING,
+                       .arg        = the_acl,
+                       .val        = 'S',
+                       .descrip    = "Set the SD in sddl format",
+               },
+               {
+                       .longName   = "viewsddl",
+                       .shortName  = 'V',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = the_acl,
+                       .val        = 'V',
+                       .descrip    = "View the SD in sddl format",
+               },
+               {
+                       .longName   = "view",
+                       .shortName  = 'v',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'v',
+                       .descrip    = "View current share permissions",
+               },
+               {
+                       .longName   = "view-all",
+                       .shortName  = 0,
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = OPT_VIEW_ALL,
+                       .descrip    = "View all current share permissions",
+               },
+               {
+                       .longName   = "machine-sid",
+                       .shortName  = 'M',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'M',
+                       .descrip    = "Initialize the machine SID",
+               },
+               {
+                       .longName   = "force",
+                       .shortName  = 'F',
+                       .argInfo    = POPT_ARG_NONE,
+                       .arg        = NULL,
+                       .val        = 'F',
+                       .descrip    = "Force storing the ACL",
+                       .argDescrip = "ACLS",
+               },
                POPT_COMMON_SAMBA
-               { NULL }
+               POPT_TABLEEND
        };
 
-       if ( !(ctx = talloc_init("main")) ) {
+       if ( !(ctx = talloc_stackframe()) ) {
                fprintf( stderr, "Failed to initialize talloc context!\n");
                return -1;
        }
 
        /* set default debug level to 1 regardless of what smb.conf sets */
-       setup_logging( "sharesec", True );
-       DEBUGLEVEL_CLASS[DBGC_ALL] = 1;
-       dbf = x_stderr;
-       x_setbuf( x_stderr, NULL );
+       setup_logging( "sharesec", DEBUG_STDERR);
 
-       setlinebuf(stdout);
+       smb_init_locale();
 
-       load_case_tables();
+       lp_set_cmdline("log level", "1");
 
-       lp_load( dyn_CONFIGFILE, False, False, False, True );
+       pc = poptGetContext("sharesec", argc, argv, long_options, 0);
 
-       pc = poptGetContext("smbcacls", argc, argv, long_options, 0);
-       
        poptSetOtherOptionHelp(pc, "sharename\n");
 
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
-#if 0
                case 'r':
                        the_acl = smb_xstrdup(poptGetOptArg(pc));
-                       mode = SMB_ACL_REMOVE;
+                       mode = SMB_ACL_DELETE;
                        break;
 
                case 'm':
@@ -325,10 +463,23 @@ int main(int argc, const char *argv[])
                        the_acl = smb_xstrdup(poptGetOptArg(pc));
                        mode = SMB_ACL_ADD;
                        break;
-#endif
+
                case 'R':
                        the_acl = smb_xstrdup(poptGetOptArg(pc));
-                       mode = SMB_ACL_REPLACE;
+                       mode = SMB_ACL_SET;
+                       break;
+
+               case 'D':
+                       mode = SMB_SD_DELETE;
+                       break;
+
+               case 'S':
+                       mode = SMB_SD_SETSDDL;
+                       the_acl = smb_xstrdup(poptGetOptArg(pc));
+                       break;
+
+               case 'V':
+                       mode = SMB_SD_VIEWSDDL;
                        break;
 
                case 'v':
@@ -338,78 +489,95 @@ int main(int argc, const char *argv[])
                case 'F':
                        force_acl = True;
                        break;
-                       
+
                case 'M':
                        initialize_sid = True;
                        break;
+               case OPT_VIEW_ALL:
+                       mode = SMB_ACL_VIEW_ALL;
+                       break;
                }
        }
-       
+
+       setlinebuf(stdout);
+
+       lp_load_with_registry_shares(get_dyn_CONFIGFILE());
+
        /* check for initializing secrets.tdb first */
-       
+
        if ( initialize_sid ) {
-               DOM_SID *sid = get_global_sam_sid();
-               
+               struct dom_sid *sid = get_global_sam_sid();
+               struct dom_sid_buf buf;
+
                if ( !sid ) {
                        fprintf( stderr, "Failed to retrieve Machine SID!\n");
-                       return 3;
+                       retval = 3;
+                       goto done;
                }
-               
-               printf ("%s\n", sid_string_static( sid ) );
-               return 0;
+
+               printf ("%s\n", dom_sid_str_buf(sid, &buf) );
+               retval = 0;
+               goto done;
        }
 
        if ( mode == SMB_ACL_VIEW && force_acl ) {
                fprintf( stderr, "Invalid combination of -F and -v\n");
-               return -1;
+               retval = -1;
+               goto done;
+       }
+
+       if (mode == SMB_ACL_VIEW_ALL) {
+               int i;
+
+               for (i=0; i<lp_numservices(); i++) {
+                       TALLOC_CTX *frame = talloc_stackframe();
+                       const char *service = lp_servicename(frame, i);
+
+                       if (service == NULL) {
+                               continue;
+                       }
+
+                       printf("[%s]\n", service);
+                       change_share_sec(frame, service, NULL, SMB_ACL_VIEW);
+                       printf("\n");
+                       TALLOC_FREE(frame);
+               }
+               goto done;
        }
 
        /* get the sharename */
 
-       if(!poptPeekArg(pc)) { 
-               poptPrintUsage(pc, stderr, 0);  
-               return -1;
+       if(!poptPeekArg(pc)) {
+               poptPrintUsage(pc, stderr, 0);
+               retval = -1;
+               goto done;
        }
-       
+
        fstrcpy(sharename, poptGetArg(pc));
-       
+
        snum = lp_servicenumber( sharename );
-       
+
        if ( snum == -1 && !force_acl ) {
                fprintf( stderr, "Invalid sharename: %s\n", sharename);
-               return -1;
+               retval = -1;
+               goto done;
        }
-               
-       switch ( mode ) {
-               case SMB_ACL_VIEW:
-                       if (!(secdesc = get_share_security( ctx, sharename,
-                                                           &sd_size )) ) {
-                               fprintf(stderr, "Unable to retrieve permissions for share [%s]\n", sharename);
-                               return -1;
-                       }
-                       sec_desc_print( stdout, secdesc );
-                       break;
-
-               case SMB_ACL_REMOVE:
-               case SMB_ACL_ADD:
-               case SMB_ACL_MODIFY:
-                       printf( "Not implemented\n");
-                       break;
 
-               case SMB_ACL_REPLACE:
-                       if ( !(secdesc = parse_acl_string( ctx, the_acl, &sd_size )) ) {
-                               fprintf( stderr, "Failed to parse acl\n");
-                               return -1;
-                       }
-                       
-                       if ( !set_share_security( ctx, lp_servicename(snum), secdesc ) ) {
-                               fprintf( stderr, "Failed to store acl for share [%s]\n", sharename );
-                               return 2;
-                       }
-                       break;
+       switch (mode) {
+       case SMB_SD_SETSDDL:
+               retval = set_sharesec_sddl(sharename, the_acl);
+               break;
+       case SMB_SD_VIEWSDDL:
+               retval = view_sharesec_sddl(sharename);
+               break;
+       default:
+               retval = change_share_sec(ctx, sharename, the_acl, mode);
+               break;
        }
 
+done:
+       poptFreeContext(pc);
        talloc_destroy(ctx);
 
-       return 0;
+       return retval;
 }