*
* 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/>.
*/
#include "includes.h"
-
-#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;
-
-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};
+#include "popt_common.h"
+#include "../libcli/security/security.h"
+#include "../librpc/gen_ndr/ndr_security.h"
+#include "passdb/machine_sid.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 };
struct perm_value {
const char *perm;
/* These values discovered by inspection */
static const struct perm_value special_values[] = {
- { "R", 0x00120089 },
- { "W", 0x00120116 },
- { "X", 0x001200a0 },
- { "D", 0x00010000 },
- { "P", 0x00040000 },
- { "O", 0x00080000 },
+ { "R", SEC_RIGHTS_FILE_READ },
+ { "W", SEC_RIGHTS_FILE_WRITE },
+ { "X", SEC_RIGHTS_FILE_EXECUTE },
+ { "D", SEC_STD_DELETE },
+ { "P", SEC_STD_WRITE_DAC },
+ { "O", SEC_STD_WRITE_OWNER },
{ NULL, 0 },
};
+#define SEC_RIGHTS_DIR_CHANGE ( SEC_RIGHTS_DIR_READ|SEC_STD_DELETE|\
+ SEC_RIGHTS_DIR_WRITE|SEC_DIR_TRAVERSE )
+
static const struct perm_value standard_values[] = {
- { "READ", 0x001200a9 },
- { "CHANGE", 0x001301bf },
- { "FULL", 0x001f01ff },
+ { "READ", SEC_RIGHTS_DIR_READ|SEC_DIR_TRAVERSE },
+ { "CHANGE", SEC_RIGHTS_DIR_CHANGE },
+ { "FULL", SEC_RIGHTS_DIR_ALL },
{ NULL, 0 },
};
/********************************************************************
- print an ACE on a FILE, using either numeric or ascii representation
+ parse an ACE in the same format as print_ace()
********************************************************************/
-static void print_ace(FILE *f, SEC_ACE *ace)
+static bool parse_ace(struct security_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;
+ struct dom_sid sid;
+ uint32_t mask;
const struct perm_value *v;
- fstring sidstr;
- int do_print = 0;
- uint32 got_mask;
-
- sid_to_string(sidstr, &ace->trustee);
-
- fprintf(f, "%s:", sidstr);
+ char *str = SMB_STRDUP(orig_str);
+ TALLOC_CTX *frame = talloc_stackframe();
- if (numeric) {
- fprintf(f, "%d/%d/0x%08x",
- ace->type, ace->flags, ace->info.mask);
- return;
+ if (!str) {
+ TALLOC_FREE(frame);
+ return False;
}
- /* 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);
+ ZERO_STRUCTP(ace);
+ p = strchr_m(str,':');
+ if (!p) {
+ fprintf(stderr, "ACE '%s': missing ':'.\n", orig_str);
+ SAFE_FREE(str);
+ TALLOC_FREE(frame);
+ return False;
}
+ *p = '\0';
+ p++;
+ /* Try to parse numeric form */
- /* Not sure what flags can be set in a file ACL */
-
- fprintf(f, "/%d/", ace->flags);
-
- /* Standard permissions */
-
- for (v = standard_values; v->perm; v++) {
- if (ace->info.mask == v->mask) {
- fprintf(f, "%s", v->perm);
- return;
- }
+ if (sscanf(p, "%u/%u/%u", &atype, &aflags, &amask) == 3 &&
+ string_to_sid(&sid, str)) {
+ goto done;
}
- /* Special permissions. Print out a hex value if we have
- leftover bits in the mask. */
-
- got_mask = ace->info.mask;
+ /* Try to parse text form */
- 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 (!string_to_sid(&sid, str)) {
+ fprintf(stderr, "ACE '%s': failed to convert '%s' to SID\n",
+ orig_str, str);
+ SAFE_FREE(str);
+ TALLOC_FREE(frame);
+ return False;
}
- if (!do_print) {
- if (got_mask != 0) {
- fprintf(f, "0x%08x", ace->info.mask);
- } else {
- do_print = 1;
- goto again;
- }
+ cp = p;
+ if (!next_token_talloc(frame, &cp, &tok, "/")) {
+ fprintf(stderr, "ACE '%s': failed to find '/' character.\n",
+ orig_str);
+ SAFE_FREE(str);
+ TALLOC_FREE(frame);
+ return False;
}
-}
-
-/********************************************************************
- print a ascii version of a security descriptor on a FILE handle
-********************************************************************/
-
-static void sec_desc_print(FILE *f, SEC_DESC *sd)
-{
- fstring sidstr;
- uint32 i;
-
- fprintf(f, "REVISION:%d\n", sd->revision);
-
- /* Print owner and group sid */
- if (sd->owner_sid) {
- sid_to_string(sidstr, sd->owner_sid);
+ 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 {
- fstrcpy(sidstr, "");
+ fprintf(stderr, "ACE '%s': missing 'ALLOWED' or 'DENIED' "
+ "entry at '%s'\n", orig_str, tok);
+ SAFE_FREE(str);
+ TALLOC_FREE(frame);
+ return False;
}
- fprintf(f, "OWNER:%s\n", sidstr);
+ /* Only numeric form accepted for flags at present */
+ /* no flags on share permissions */
- if (sd->grp_sid) {
- sid_to_string(sidstr, sd->grp_sid);
- } else {
- fstrcpy(sidstr, "");
+ if (!(next_token_talloc(frame, &cp, &tok, "/") &&
+ sscanf(tok, "%u", &aflags) && aflags == 0)) {
+ fprintf(stderr, "ACE '%s': bad integer flags entry at '%s'\n",
+ orig_str, tok);
+ SAFE_FREE(str);
+ TALLOC_FREE(frame);
+ return False;
}
- fprintf(f, "GROUP:%s\n", sidstr);
+ if (!next_token_talloc(frame, &cp, &tok, "/")) {
+ fprintf(stderr, "ACE '%s': missing / at '%s'\n",
+ orig_str, tok);
+ SAFE_FREE(str);
+ TALLOC_FREE(frame);
+ return False;
+ }
- /* 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 (strncmp(tok, "0x", 2) == 0) {
+ if (sscanf(tok, "%u", &amask) != 1) {
+ fprintf(stderr, "ACE '%s': bad hex number at '%s'\n",
+ orig_str, tok);
+ TALLOC_FREE(frame);
+ SAFE_FREE(str);
+ return False;
+ }
+ goto done;
}
-}
+ for (v = standard_values; v->perm; v++) {
+ if (strcmp(tok, v->perm) == 0) {
+ amask = v->mask;
+ goto done;
+ }
+ }
-/********************************************************************
-********************************************************************/
+ p = tok;
-static BOOL parse_ace( TALLOC_CTX *ctx, SEC_ACE *ace, char *entry )
-{
- 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;
+ while(*p) {
+ bool found = False;
- case 'R':
- case 'r':
- mask = GENERIC_RIGHTS_FILE_READ|GENERIC_RIGHTS_FILE_EXECUTE|\
- STANDARD_RIGHTS_READ_ACCESS|STANDARD_RIGHTS_EXECUTE_ACCESS;
- break;
+ for (v = special_values; v->perm; v++) {
+ if (v->perm[0] == *p) {
+ amask |= v->mask;
+ found = True;
+ }
+ }
- default:
+ if (!found) {
+ fprintf(stderr, "ACE '%s': bad permission value at "
+ "'%s'\n", orig_str, p);
+ TALLOC_FREE(frame);
+ SAFE_FREE(str);
return False;
+ }
+ p++;
}
-
- init_sec_access( &sa, mask );
- /* no flags on share permissions */
- init_sec_ace( ace, &sid, SEC_ACE_TYPE_ACCESS_ALLOWED, sa, 0 );
-
+ if (*p) {
+ TALLOC_FREE(frame);
+ SAFE_FREE(str);
+ return False;
+ }
+
+ done:
+ mask = amask;
+ init_sec_ace(ace, &sid, atype, mask, aflags);
+ SAFE_FREE(str);
+ TALLOC_FREE(frame);
return True;
}
/********************************************************************
********************************************************************/
-static SEC_DESC* parse_acl_string( TALLOC_CTX *ctx, const char *szACL, size_t *sd_size )
+static struct security_descriptor* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size )
{
- SEC_DESC *sd = NULL;
- SEC_ACE *ace;
- SEC_ACL *acl;
+ struct security_descriptor *sd = NULL;
+ struct security_ace *ace;
+ struct security_acl *theacl;
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 )) )
+
+ if ( !(ace = talloc_zero_array( mem_ctx, struct security_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 ) )
+
+ if ( !parse_ace( &ace[i], acl_string ) )
return NULL;
pacl = end_acl;
pacl++;
}
-
- if ( !(acl = make_sec_acl( ctx, NT4_ACL_REVISION, num_ace, ace )) )
+
+ if ( !(theacl = make_sec_acl( mem_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);
+
+ sd = make_sec_desc( mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
+ NULL, NULL, NULL, theacl, sd_size);
return sd;
}
+/* 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 (!(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;
+}
+
+/* The MSDN is contradictory over the ordering of ACE entries in an ACL.
+ However NT4 gives a "The information may have been modified by a
+ computer running Windows NT 5.0" if denied ACEs do not appear before
+ allowed ACEs. */
+
+static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
+{
+ if (security_ace_equal(ace1, ace2))
+ return 0;
+
+ if (ace1->type != ace2->type)
+ return ace2->type - ace1->type;
+
+ 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;
+
+ if (ace1->access_mask != ace2->access_mask)
+ return ace1->access_mask - ace2->access_mask;
+
+ if (ace1->size != ace2->size)
+ return ace1->size - ace2->size;
+
+ return memcmp(ace1, ace2, sizeof(struct security_ace));
+}
+
+static void sort_acl(struct security_acl *the_acl)
+{
+ uint32 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 {
+ i++;
+ }
+ }
+}
+
+
+static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *the_acl, enum acl_mode mode)
+{
+ struct security_descriptor *sd = NULL;
+ struct security_descriptor *old = NULL;
+ size_t sd_size = 0;
+ uint32 i, j;
+ char *sd_str;
+
+ 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 ( (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;
+ }
+
+ switch (mode) {
+ case SMB_ACL_VIEW_ALL:
+ /* should not happen */
+ return 0;
+ case SMB_ACL_VIEW:
+ sd_str = ndr_print_struct_string(mem_ctx,
+ (ndr_print_fn_t)ndr_print_security_descriptor,
+ "", old);
+ fprintf(stdout, "%s\n", sd_str);
+ talloc_free(sd_str);
+ 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 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) {
+ sd_str = ndr_print_struct_string(mem_ctx,
+ (ndr_print_fn_t)ndr_print_security_ace,
+ "", &sd->dacl->aces[i]);
+ printf("ACL for ACE: %s not found\n", sd_str);
+ talloc_free(sd_str);
+ }
+ }
+ 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 (!found) {
+ printf("ACL for SID %s not found\n",
+ sid_string_tos(&sd->dacl->aces[i].trustee));
+ }
+ }
+
+ 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;
+ }
+
+ /* Denied ACE entries must come before allowed ones */
+ sort_acl(old->dacl);
+
+ if ( !set_share_security( sharename, old ) ) {
+ fprintf( stderr, "Failed to store acl for share [%s]\n", sharename );
+ return 2;
+ }
+ return 0;
+}
+
+static int set_sharesec_sddl(const char *sharename, const char *sddl)
+{
+ struct security_descriptor *sd;
+ bool ret;
+
+ sd = sddl_decode(talloc_tos(), sddl, get_global_sam_sid());
+ if (sd == NULL) {
+ fprintf(stderr, "Failed to parse acl\n");
+ return -1;
+ }
+
+ ret = set_share_security(sharename, sd);
+ TALLOC_FREE(sd);
+ if (!ret) {
+ fprintf(stderr, "Failed to store acl for share [%s]\n",
+ sharename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int view_sharesec_sddl(const char *sharename)
+{
+ 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;
+ }
+
+ 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" },
+ { "remove", 'r', POPT_ARG_STRING, &the_acl, 'r', "Remove ACEs", "ACL" },
+ { "modify", 'm', POPT_ARG_STRING, &the_acl, 'm', "Modify existing ACEs", "ACL" },
+ { "add", 'a', POPT_ARG_STRING, &the_acl, 'a', "Add ACEs", "ACL" },
+ { "replace", 'R', POPT_ARG_STRING, &the_acl, 'R', "Overwrite share permission ACL", "ACLS" },
+ { "delete", 'D', POPT_ARG_NONE, NULL, 'D', "Delete the entire security descriptor" },
+ { "setsddl", 'S', POPT_ARG_STRING, the_acl, 'S',
+ "Set the SD in sddl format" },
+ { "viewsddl", 'V', POPT_ARG_NONE, the_acl, 'V',
+ "View the SD in sddl format" },
{ "view", 'v', POPT_ARG_NONE, NULL, 'v', "View current share permissions" },
+ { "view-all", 0, POPT_ARG_NONE, NULL, OPT_VIEW_ALL,
+ "View all 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" },
POPT_COMMON_SAMBA
{ NULL }
};
- 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':
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':
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(), False, False, False,
+ True );
+
/* check for initializing secrets.tdb first */
-
+
if ( initialize_sid ) {
- DOM_SID *sid = get_global_sam_sid();
-
+ struct dom_sid *sid = get_global_sam_sid();
+
if ( !sid ) {
fprintf( stderr, "Failed to retrieve Machine SID!\n");
return 3;
}
-
- printf ("%s\n", sid_string_static( sid ) );
+
+ printf ("%s\n", sid_string_tos( sid ) );
return 0;
}
return -1;
}
+ 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);
+ if(!poptPeekArg(pc)) {
+ poptPrintUsage(pc, stderr, 0);
return -1;
}
-
+
fstrcpy(sharename, poptGetArg(pc));
-
+
snum = lp_servicenumber( sharename );
-
+
if ( snum == -1 && !force_acl ) {
fprintf( stderr, "Invalid sharename: %s\n", sharename);
return -1;
}
-
- 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:
talloc_destroy(ctx);
- return 0;
+ return retval;
}