From fbdcf2663b56007a438ac4f0d8d82436b1bfe688 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Jul 2006 18:01:26 +0000
Subject: r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper
 layer directories but this is what everyone is waiting for....

Jeremy.
(This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
---
 source3/utils/sharesec.c | 414 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 414 insertions(+)
 create mode 100644 source3/utils/sharesec.c

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
new file mode 100644
index 0000000000..aa4210b51d
--- /dev/null
+++ b/source3/utils/sharesec.c
@@ -0,0 +1,414 @@
+/*
+ *  Unix SMB/Netbios implementation.
+ *  Utility for managing share permissions
+ *
+ *  Copyright (C) Tim Potter                    2000
+ *  Copyright (C) Jeremy Allison                2000
+ *  Copyright (C) Jelmer Vernooij               2003
+ *  Copyright (C) Gerald (Jerry) Carter         2005.
+ *
+ *  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
+ *  (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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#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};
+
+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 },
+};
+
+/********************************************************************
+ print an ACE on a FILE, using either numeric or ascii representation
+********************************************************************/
+
+static void print_ace(FILE *f, SEC_ACE *ace)
+{
+	const struct perm_value *v;
+	fstring sidstr;
+	int do_print = 0;
+	uint32 got_mask;
+
+	sid_to_string(sidstr, &ace->trustee);
+
+	fprintf(f, "%s:", sidstr);
+
+	if (numeric) {
+		fprintf(f, "%d/%d/0x%08x", 
+			ace->type, ace->flags, ace->info.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);
+	}
+
+	/* 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;
+		}
+	}
+
+	/* Special permissions.  Print out a hex value if we have
+	   leftover bits in the mask. */
+
+	got_mask = ace->info.mask;
+
+ again:
+	for (v = special_values; v->perm; v++) {
+		if ((ace->info.mask & v->mask) == v->mask) {
+			if (do_print) {
+				fprintf(f, "%s", v->perm);
+			}
+			got_mask &= ~v->mask;
+		}
+	}
+
+	if (!do_print) {
+		if (got_mask != 0) {
+			fprintf(f, "0x%08x", ace->info.mask);
+		} else {
+			do_print = 1;
+			goto again;
+		}
+	}
+}
+
+/********************************************************************
+ 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);
+	} else {
+		fstrcpy(sidstr, "");
+	}
+
+	fprintf(f, "OWNER:%s\n", sidstr);
+
+	if (sd->grp_sid) {
+		sid_to_string(sidstr, sd->grp_sid);
+	} else {
+		fstrcpy(sidstr, "");
+	}
+
+	fprintf(f, "GROUP:%s\n", sidstr);
+
+	/* 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");
+	}
+
+}
+
+/********************************************************************
+********************************************************************/
+
+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;
+
+		case 'R':
+		case 'r':
+			mask = GENERIC_RIGHTS_FILE_READ|GENERIC_RIGHTS_FILE_EXECUTE|\
+				STANDARD_RIGHTS_READ_ACCESS|STANDARD_RIGHTS_EXECUTE_ACCESS;
+			break;
+
+		default:
+			return False;
+	}
+	
+	init_sec_access( &sa, mask );
+
+	/* no flags on share permissions */
+	init_sec_ace( ace, &sid, SEC_ACE_TYPE_ACCESS_ALLOWED, sa, 0 );
+	
+	return True;
+}
+
+
+/********************************************************************
+********************************************************************/
+
+static SEC_DESC* parse_acl_string( TALLOC_CTX *ctx, const char *szACL, size_t *sd_size )
+{
+	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++;
+	}
+	
+	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;
+}
+
+/********************************************************************
+  main program
+********************************************************************/
+
+int main(int argc, const char *argv[])
+{
+	int opt;
+	enum acl_mode mode = SMB_ACL_REPLACE;
+	static char *the_acl = NULL;
+	fstring sharename;
+	BOOL force_acl = False;
+	size_t sd_size = 0;
+	SEC_DESC *secdesc;
+	int snum;
+	poptContext pc;
+	TALLOC_CTX *ctx;
+	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" },
+		POPT_COMMON_SAMBA
+		{ NULL }
+	};
+
+	if ( !(ctx = talloc_init("main")) ) {
+		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 );
+
+	setlinebuf(stdout);
+
+	load_case_tables();
+
+	lp_load( dyn_CONFIGFILE, False, False, False, True );
+
+	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;
+			break;
+
+		case 'm':
+			the_acl = smb_xstrdup(poptGetOptArg(pc));
+			mode = SMB_ACL_MODIFY;
+			break;
+
+		case 'a':
+			the_acl = smb_xstrdup(poptGetOptArg(pc));
+			mode = SMB_ACL_ADD;
+			break;
+#endif
+		case 'R':
+			the_acl = smb_xstrdup(poptGetOptArg(pc));
+			mode = SMB_ACL_REPLACE;
+			break;
+
+		case 'v':
+			mode = SMB_ACL_VIEW;
+			break;
+
+		case 'F':
+			force_acl = True;
+			break;
+			
+		case 'M':
+			initialize_sid = True;
+			break;
+		}
+	}
+	
+	/* check for initializing secrets.tdb first */
+	
+	if ( initialize_sid ) {
+		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 ) );
+		return 0;
+	}
+
+	if ( mode == SMB_ACL_VIEW && force_acl ) {
+		fprintf( stderr, "Invalid combination of -F and -v\n");
+		return -1;
+	}
+
+	/* get the sharename */
+
+	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, snum, &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;
+	}
+
+	talloc_destroy(ctx);
+
+	return 0;
+}
-- 
cgit 


From 1f2419d9f8be0efcf2e43ecf97ea59d501e62fe8 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 14 Jul 2006 17:46:06 +0000
Subject: r17032: I thought I had already merged this from trunk:

> r16959 | vlendec | 2006-07-11 23:10:44 +0200 (Di, 11 Jul 2006) | 1 line
>
> get_share_security does not need snum, activate RPC-SAMBA3-SRVSVC

Volker
(This used to be commit c89471e15766fcdbfa4f40701e12c19f95c2d8ef)
---
 source3/utils/sharesec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index aa4210b51d..3f66d4da6e 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -382,7 +382,8 @@ int main(int argc, const char *argv[])
 		
 	switch ( mode ) {
 		case SMB_ACL_VIEW:
-			if (!(secdesc = get_share_security( ctx, snum, &sd_size )) ) {
+			if (!(secdesc = get_share_security( ctx, sharename,
+							    &sd_size )) ) {
 				fprintf(stderr, "Unable to retrieve permissions for share [%s]\n", sharename);
 				return -1;
 			}
-- 
cgit 


From 4db7642caa99c1b054322a8971c4b673556487ce Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Sep 2006 22:23:12 +0000
Subject: r18745: Use the Samba4 data structures for security descriptors and
 security descriptor buffers.

Make security access masks simply a uint32 rather than a structure
with a uint32 in it.
(This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
---
 source3/utils/sharesec.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 3f66d4da6e..5749cf2f55 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -75,7 +75,7 @@ static void print_ace(FILE *f, SEC_ACE *ace)
 
 	if (numeric) {
 		fprintf(f, "%d/%d/0x%08x", 
-			ace->type, ace->flags, ace->info.mask);
+			ace->type, ace->flags, ace->access_mask);
 		return;
 	}
 
@@ -96,7 +96,7 @@ static void print_ace(FILE *f, SEC_ACE *ace)
 	/* Standard permissions */
 
 	for (v = standard_values; v->perm; v++) {
-		if (ace->info.mask == v->mask) {
+		if (ace->access_mask == v->mask) {
 			fprintf(f, "%s", v->perm);
 			return;
 		}
@@ -105,11 +105,11 @@ static void print_ace(FILE *f, SEC_ACE *ace)
 	/* Special permissions.  Print out a hex value if we have
 	   leftover bits in the mask. */
 
-	got_mask = ace->info.mask;
+	got_mask = ace->access_mask;
 
  again:
 	for (v = special_values; v->perm; v++) {
-		if ((ace->info.mask & v->mask) == v->mask) {
+		if ((ace->access_mask & v->mask) == v->mask) {
 			if (do_print) {
 				fprintf(f, "%s", v->perm);
 			}
@@ -119,7 +119,7 @@ static void print_ace(FILE *f, SEC_ACE *ace)
 
 	if (!do_print) {
 		if (got_mask != 0) {
-			fprintf(f, "0x%08x", ace->info.mask);
+			fprintf(f, "0x%08x", ace->access_mask);
 		} else {
 			do_print = 1;
 			goto again;
@@ -148,8 +148,8 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd)
 
 	fprintf(f, "OWNER:%s\n", sidstr);
 
-	if (sd->grp_sid) {
-		sid_to_string(sidstr, sd->grp_sid);
+	if (sd->group_sid) {
+		sid_to_string(sidstr, sd->group_sid);
 	} else {
 		fstrcpy(sidstr, "");
 	}
@@ -158,7 +158,7 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd)
 
 	/* Print aces */
 	for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
-		SEC_ACE *ace = &sd->dacl->ace[i];
+		SEC_ACE *ace = &sd->dacl->aces[i];
 		fprintf(f, "ACL:");
 		print_ace(f, ace);
 		fprintf(f, "\n");
-- 
cgit 


From bef92ebb257adda6634c559e0240ad4991840212 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sat, 11 Nov 2006 18:07:51 +0000
Subject: r19669: set_share_security does not need a mem_ctx passed (This used
 to be commit 53eaa603eb84047263c27d57b8c0f5ce8e157189)

---
 source3/utils/sharesec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 5749cf2f55..11882ff07a 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -402,7 +402,7 @@ int main(int argc, const char *argv[])
 				return -1;
 			}
 			
-			if ( !set_share_security( ctx, lp_servicename(snum), secdesc ) ) {
+			if ( !set_share_security( lp_servicename(snum), secdesc ) ) {
 				fprintf( stderr, "Failed to store acl for share [%s]\n", sharename );
 				return 2;
 			}
-- 
cgit 


From c909c6722b065e898da43b0e1448fc4314649553 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sun, 18 Feb 2007 01:31:50 +0000
Subject: r21417: Janitor for Herb. Make sure sharesec.c is functionally
 identical in 3.0.25 and 3.0. Jeremy. (This used to be commit
 eabe14825877a05d544bb61080701170449c7d26)

---
 source3/utils/sharesec.c | 446 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 319 insertions(+), 127 deletions(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 11882ff07a..4fa948a18a 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -25,14 +25,9 @@
 
 #include "includes.h"
 
-#define CREATE_ACCESS_READ READ_CONTROL_ACCESS
+static TALLOC_CTX *ctx;
 
-/* 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};
+enum acl_mode {SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD, SMB_ACL_SET, SMB_ACL_VIEW };
 
 struct perm_value {
 	const char *perm;
@@ -42,42 +37,35 @@ struct perm_value {
 /* 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
+ print an ACE on a FILE
 ********************************************************************/
 
 static void print_ace(FILE *f, SEC_ACE *ace)
 {
 	const struct perm_value *v;
-	fstring sidstr;
 	int do_print = 0;
 	uint32 got_mask;
 
-	sid_to_string(sidstr, &ace->trustee);
-
-	fprintf(f, "%s:", sidstr);
-
-	if (numeric) {
-		fprintf(f, "%d/%d/0x%08x", 
-			ace->type, ace->flags, ace->access_mask);
-		return;
-	}
+	fprintf(f, "%s:", sid_string_static(&ace->trustee));
 
 	/* Ace type */
 
@@ -133,28 +121,15 @@ static void print_ace(FILE *f, SEC_ACE *ace)
 
 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);
-	} else {
-		fstrcpy(sidstr, "");
-	}
-
-	fprintf(f, "OWNER:%s\n", sidstr);
+	fprintf(f, "OWNER:%s\n", sid_string_static(sd->owner_sid));
 
-	if (sd->group_sid) {
-		sid_to_string(sidstr, sd->group_sid);
-	} else {
-		fstrcpy(sidstr, "");
-	}
-
-	fprintf(f, "GROUP:%s\n", sidstr);
+	fprintf(f, "GROUP:%s\n", sid_string_static(sd->group_sid));
 
 	/* Print aces */
 	for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
@@ -167,44 +142,135 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd)
 }
 
 /********************************************************************
+    parse an ACE in the same format as print_ace()
 ********************************************************************/
 
-static BOOL parse_ace( TALLOC_CTX *ctx, SEC_ACE *ace, char *entry )
+static BOOL parse_ace(SEC_ACE *ace, const char *orig_str)
 {
-	SEC_ACCESS sa;
-	char *p = strchr_m( entry, ':' );
+	char *p;
+	const char *cp;
+	fstring tok;
+	unsigned int atype = 0;
+	unsigned int aflags = 0;
+	unsigned int amask = 0;
 	DOM_SID sid;
-	uint32 mask;
-	
-	if ( !p )
+	SEC_ACCESS mask;
+	const struct perm_value *v;
+	char *str = SMB_STRDUP(orig_str);
+
+	if (!str) {
 		return False;
-		
+	}
+
+	ZERO_STRUCTP(ace);
+	p = strchr_m(str,':');
+	if (!p) {
+		printf("ACE '%s': missing ':'.\n", orig_str);
+		SAFE_FREE(str);
+		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;
+	/* Try to parse numeric form */
 
-		case 'R':
-		case 'r':
-			mask = GENERIC_RIGHTS_FILE_READ|GENERIC_RIGHTS_FILE_EXECUTE|\
-				STANDARD_RIGHTS_READ_ACCESS|STANDARD_RIGHTS_EXECUTE_ACCESS;
-			break;
+	if (sscanf(p, "%i/%i/%i", &atype, &aflags, &amask) == 3 &&
+	    string_to_sid(&sid, str)) {
+		goto done;
+	}
 
-		default:
-			return False;
+	/* Try to parse text form */
+
+	if (!string_to_sid(&sid, str)) {
+		printf("ACE '%s': failed to convert '%s' to SID\n",
+			orig_str, str);
+		SAFE_FREE(str);
+		return False;
+	}
+
+	cp = p;
+	if (!next_token(&cp, tok, "/", sizeof(fstring))) {
+		printf("ACE '%s': failed to find '/' character.\n",
+			orig_str);
+		SAFE_FREE(str);
+		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);
+		return False;
 	}
-	
-	init_sec_access( &sa, mask );
 
+	/* Only numeric form accepted for flags at present */
 	/* no flags on share permissions */
-	init_sec_ace( ace, &sid, SEC_ACE_TYPE_ACCESS_ALLOWED, sa, 0 );
-	
+
+	if (!(next_token(&cp, tok, "/", sizeof(fstring)) &&
+	      sscanf(tok, "%i", &aflags) && aflags == 0)) {
+		printf("ACE '%s': bad integer flags entry at '%s'\n",
+			orig_str, tok);
+		SAFE_FREE(str);
+		return False;
+	}
+
+	if (!next_token(&cp, tok, "/", sizeof(fstring))) {
+		printf("ACE '%s': missing / at '%s'\n",
+			orig_str, tok);
+		SAFE_FREE(str);
+		return False;
+	}
+
+	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);
+			return False;
+		}
+		goto done;
+	}
+
+	for (v = standard_values; v->perm; v++) {
+		if (strcmp(tok, v->perm) == 0) {
+			amask = v->mask;
+			goto done;
+		}
+	}
+
+	p = tok;
+
+	while(*p) {
+		BOOL found = False;
+
+		for (v = special_values; v->perm; v++) {
+			if (v->perm[0] == *p) {
+				amask |= v->mask;
+				found = True;
+			}
+		}
+
+		if (!found) {
+			printf("ACE '%s': bad permission value at '%s'\n",
+				orig_str, p);
+			SAFE_FREE(str);
+		 	return False;
+		}
+		p++;
+	}
+
+	if (*p) {
+		SAFE_FREE(str);
+		return False;
+	}
+
+ done:
+	mask = amask;
+	init_sec_ace(ace, &sid, atype, mask, aflags);
+	SAFE_FREE(str);
 	return True;
 }
 
@@ -212,7 +278,7 @@ static BOOL parse_ace( TALLOC_CTX *ctx, SEC_ACE *ace, char *entry )
 /********************************************************************
 ********************************************************************/
 
-static SEC_DESC* parse_acl_string( TALLOC_CTX *ctx, const char *szACL, size_t *sd_size )
+static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t *sd_size )
 {
 	SEC_DESC *sd = NULL;
 	SEC_ACE *ace;
@@ -227,7 +293,7 @@ static SEC_DESC* parse_acl_string( TALLOC_CTX *ctx, const char *szACL, size_t *s
 	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, SEC_ACE, num_ace )) ) 
 		return NULL;
 	
 	for ( i=0; i<num_ace; i++ ) {
@@ -237,24 +303,183 @@ static SEC_DESC* parse_acl_string( TALLOC_CTX *ctx, const char *szACL, size_t *s
 		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 ( !(acl = 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, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, 
+		NULL, NULL, NULL, acl, sd_size);
 
 	return sd;
 }
 
+/* add an ACE to a list of ACEs in a SEC_ACL */
+static BOOL add_ace(TALLOC_CTX *mem_ctx, SEC_ACL **the_acl, SEC_ACE *ace)
+{
+	SEC_ACL *new_ace;
+	SEC_ACE *aces;
+	if (! *the_acl) {
+		return (((*the_acl) = make_sec_acl(mem_ctx, 3, 1, ace)) != NULL);
+	}
+
+	if (!(aces = SMB_CALLOC_ARRAY(SEC_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));
+	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(SEC_ACE *ace1, SEC_ACE *ace2)
+{
+	if (sec_ace_equal(ace1, ace2)) 
+		return 0;
+
+	if (ace1->type != ace2->type) 
+		return ace2->type - ace1->type;
+
+	if (sid_compare(&ace1->trustee, &ace2->trustee)) 
+		return 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(SEC_ACE));
+}
+
+static void sort_acl(SEC_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);
+
+	for (i=1;i<the_acl->num_aces;) {
+		if (sec_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)
+{
+	SEC_DESC *sd;
+	SEC_DESC *old = NULL;
+	size_t sd_size = 0;
+	uint32 i, j;
+	
+	if (mode != SMB_ACL_SET) {
+	    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) && !(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:
+		sec_desc_print( stdout, old);
+		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 (sec_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) {
+		printf("ACL for ACE:");
+		print_ace(stdout, &sd->dacl->aces[i]);
+		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 (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_static(&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;
+	}
+
+	/* 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;
+}
+
 /********************************************************************
   main program
 ********************************************************************/
@@ -262,24 +487,20 @@ static SEC_DESC* parse_acl_string( TALLOC_CTX *ctx, const char *szACL, size_t *s
 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;
 	int snum;
 	poptContext pc;
-	TALLOC_CTX *ctx;
 	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', "Delete an ACE", "ACL" },
+		{ "modify", 'm', POPT_ARG_STRING, &the_acl, 'm', "Modify an acl", "ACL" },
+		{ "add", 'a', POPT_ARG_STRING, &the_acl, 'a', "Add an ACE", "ACL" },
+		{ "replace", 'R', POPT_ARG_STRING, &the_acl, '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" },
@@ -298,22 +519,15 @@ int main(int argc, const char *argv[])
 	dbf = x_stderr;
 	x_setbuf( x_stderr, NULL );
 
-	setlinebuf(stdout);
-
-	load_case_tables();
-
-	lp_load( dyn_CONFIGFILE, False, False, False, True );
-
-	pc = poptGetContext("smbcacls", argc, argv, long_options, 0);
+	pc = poptGetContext("sharesec", 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 +539,9 @@ 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 'v':
@@ -345,6 +558,12 @@ int main(int argc, const char *argv[])
 		}
 	}
 	
+	setlinebuf(stdout);
+
+	load_case_tables();
+
+	lp_load( dyn_CONFIGFILE, False, False, False, True );
+
 	/* check for initializing secrets.tdb first */
 	
 	if ( initialize_sid ) {
@@ -380,36 +599,9 @@ int main(int argc, const char *argv[])
 		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( lp_servicename(snum), secdesc ) ) {
-				fprintf( stderr, "Failed to store acl for share [%s]\n", sharename );
-				return 2;
-			}
-			break;
-	}
-
+	retval = change_share_sec(ctx, sharename, the_acl, mode);
+	
 	talloc_destroy(ctx);
 
-	return 0;
+	return retval;
 }
-- 
cgit 


From d824b98f80ba186030cbb70b3a1e5daf80469ecd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 9 Jul 2007 19:25:36 +0000
Subject: r23779: Change from v2 or later to v3 or later. Jeremy. (This used to
 be commit 407e6e695b8366369b7c76af1ff76869b45347b3)

---
 source3/utils/sharesec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 4fa948a18a..5d61f71771 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -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,
-- 
cgit 


From 153cfb9c83534b09f15cc16205d7adb19b394928 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 05:23:25 +0000
Subject: r23801: The FSF has moved around a lot. This fixes their Mass Ave
 address. (This used to be commit 87c91e4362c51819032bfbebbb273c52e203b227)

---
 source3/utils/sharesec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 5d61f71771..a1774d698e 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -18,8 +18,7 @@
  *  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/>.
  */
 
 
-- 
cgit 


From faefb22c61568c678476b4dad36bdc5ce3afb499 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 4 Sep 2007 05:39:06 +0000
Subject: r24943: Some stackframes (This used to be commit
 cddb9f11d5fafcd3797cb242775c37f0c04d4f15)

---
 source3/utils/sharesec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index a1774d698e..45bde5cf8e 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -507,7 +507,7 @@ int main(int argc, const char *argv[])
 		{ NULL }
 	};
 
-	if ( !(ctx = talloc_init("main")) ) {
+	if ( !(ctx = talloc_stackframe()) ) {
 		fprintf( stderr, "Failed to initialize talloc context!\n");
 		return -1;
 	}
-- 
cgit 


From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 18 Oct 2007 17:40:25 -0700
Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in
 various places whilst doing this (places that assumed BOOL == int). I also
 need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to
 be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)

---
 source3/utils/sharesec.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 45bde5cf8e..e03222b005 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -144,7 +144,7 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd)
     parse an ACE in the same format as print_ace()
 ********************************************************************/
 
-static BOOL parse_ace(SEC_ACE *ace, const char *orig_str)
+static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 {
 	char *p;
 	const char *cp;
@@ -243,7 +243,7 @@ static BOOL parse_ace(SEC_ACE *ace, const char *orig_str)
 	p = tok;
 
 	while(*p) {
-		BOOL found = False;
+		bool found = False;
 
 		for (v = special_values; v->perm; v++) {
 			if (v->perm[0] == *p) {
@@ -319,7 +319,7 @@ static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t
 }
 
 /* add an ACE to a list of ACEs in a SEC_ACL */
-static BOOL add_ace(TALLOC_CTX *mem_ctx, SEC_ACL **the_acl, SEC_ACE *ace)
+static bool add_ace(TALLOC_CTX *mem_ctx, SEC_ACL **the_acl, SEC_ACE *ace)
 {
 	SEC_ACL *new_ace;
 	SEC_ACE *aces;
@@ -412,7 +412,7 @@ static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *th
 		return 0;
 	case SMB_ACL_DELETE:
 	    for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
-		BOOL found = False;
+		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])) {
@@ -436,7 +436,7 @@ static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *th
 	    break;
 	case SMB_ACL_MODIFY:
 	    for (i=0;sd->dacl && i<sd->dacl->num_aces;i++) {
-		BOOL found = False;
+		bool found = False;
 
 		for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
 		    if (sid_equal(&sd->dacl->aces[i].trustee,
@@ -490,10 +490,10 @@ int main(int argc, const char *argv[])
 	enum acl_mode mode = SMB_ACL_SET;
 	static char *the_acl = NULL;
 	fstring sharename;
-	BOOL force_acl = False;
+	bool force_acl = False;
 	int snum;
 	poptContext pc;
-	BOOL initialize_sid = False;
+	bool initialize_sid = False;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{ "remove", 'r', POPT_ARG_STRING, &the_acl, 'r', "Delete an ACE", "ACL" },
-- 
cgit 


From 42cfffae80480eae4381902fff3f7c61f858a933 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Dec 2007 17:32:32 -0800
Subject: Remove next_token - all uses must now be next_token_talloc. No more
 temptations to use static length strings. Jeremy. (This used to be commit
 ec003f39369910dee852b7cafb883ddaa321c2de)

---
 source3/utils/sharesec.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index e03222b005..cd2c78f8f3 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -148,7 +148,7 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 {
 	char *p;
 	const char *cp;
-	fstring tok;
+	char *tok;
 	unsigned int atype = 0;
 	unsigned int aflags = 0;
 	unsigned int amask = 0;
@@ -156,8 +156,10 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 	SEC_ACCESS mask;
 	const struct perm_value *v;
 	char *str = SMB_STRDUP(orig_str);
+	TALLOC_CTX *frame = talloc_stackframe();
 
 	if (!str) {
+		TALLOC_FREE(frame);
 		return False;
 	}
 
@@ -166,6 +168,7 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 	if (!p) {
 		printf("ACE '%s': missing ':'.\n", orig_str);
 		SAFE_FREE(str);
+		TALLOC_FREE(frame);
 		return False;
 	}
 	*p = '\0';
@@ -183,14 +186,16 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_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(&cp, tok, "/", sizeof(fstring))) {
+	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;
 	}
 
@@ -202,24 +207,27 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 		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 */
 	/* no flags on share permissions */
 
-	if (!(next_token(&cp, tok, "/", sizeof(fstring)) &&
+	if (!(next_token_talloc(frame, &cp, &tok, "/") &&
 	      sscanf(tok, "%i", &aflags) && aflags == 0)) {
 		printf("ACE '%s': bad integer flags entry at '%s'\n",
 			orig_str, tok);
 		SAFE_FREE(str);
+		TALLOC_FREE(frame);
 		return False;
 	}
 
-	if (!next_token(&cp, tok, "/", sizeof(fstring))) {
+	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;
 	}
 
@@ -227,6 +235,7 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 		if (sscanf(tok, "%i", &amask) != 1) {
 			printf("ACE '%s': bad hex number at '%s'\n",
 				orig_str, tok);
+			TALLOC_FREE(frame);
 			SAFE_FREE(str);
 			return False;
 		}
@@ -255,6 +264,7 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 		if (!found) {
 			printf("ACE '%s': bad permission value at '%s'\n",
 				orig_str, p);
+			TALLOC_FREE(frame);
 			SAFE_FREE(str);
 		 	return False;
 		}
@@ -262,6 +272,7 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 	}
 
 	if (*p) {
+		TALLOC_FREE(frame);
 		SAFE_FREE(str);
 		return False;
 	}
@@ -270,6 +281,7 @@ static bool parse_ace(SEC_ACE *ace, const char *orig_str)
 	mask = amask;
 	init_sec_ace(ace, &sid, atype, mask, aflags);
 	SAFE_FREE(str);
+	TALLOC_FREE(frame);
 	return True;
 }
 
-- 
cgit 


From 7faee02d0d351c5c039e8f1be7e82ce3a93cbe96 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 10 Dec 2007 11:30:37 -0800
Subject: Remove the char[1024] strings from dynconfig. Replace them with
 malloc'ing accessor functions. Should save a lot of static space :-). Jeremy.
 (This used to be commit 52dc5eaef2106015b3a8b659e818bdb15ad94b05)

---
 source3/utils/sharesec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index cd2c78f8f3..3da406dd34 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -573,7 +573,7 @@ int main(int argc, const char *argv[])
 
 	load_case_tables();
 
-	lp_load( dyn_CONFIGFILE, False, False, False, True );
+	lp_load( get_dyn_CONFIGFILE(), False, False, False, True );
 
 	/* check for initializing secrets.tdb first */
 	
-- 
cgit 


From 7b01537679d4d4f1408634fe63c64c144f9d9519 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 15 Dec 2007 21:53:26 +0100
Subject: Replace sid_string_static with sid_string_tos

In utils/ I was a bit lazy...
(This used to be commit 60e830b0f4571bd5d9039f2edd199534f2a4c341)
---
 source3/utils/sharesec.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source3/utils/sharesec.c')

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 3da406dd34..9409690c8b 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -64,7 +64,7 @@ static void print_ace(FILE *f, SEC_ACE *ace)
 	int do_print = 0;
 	uint32 got_mask;
 
-	fprintf(f, "%s:", sid_string_static(&ace->trustee));
+	fprintf(f, "%s:", sid_string_tos(&ace->trustee));
 
 	/* Ace type */
 
@@ -126,9 +126,9 @@ static void sec_desc_print(FILE *f, SEC_DESC *sd)
 
 	/* Print owner and group sid */
 
-	fprintf(f, "OWNER:%s\n", sid_string_static(sd->owner_sid));
+	fprintf(f, "OWNER:%s\n", sid_string_tos(sd->owner_sid));
 
-	fprintf(f, "GROUP:%s\n", sid_string_static(sd->group_sid));
+	fprintf(f, "GROUP:%s\n", sid_string_tos(sd->group_sid));
 
 	/* Print aces */
 	for (i = 0; sd->dacl && i < sd->dacl->num_aces; i++) {
@@ -459,7 +459,8 @@ static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *th
 		}
 
 		if (!found) {
-		    printf("ACL for SID %s not found\n", sid_string_static(&sd->dacl->aces[i].trustee));
+		    printf("ACL for SID %s not found\n",
+			   sid_string_tos(&sd->dacl->aces[i].trustee));
 		}
 	    }
 
@@ -585,7 +586,7 @@ int main(int argc, const char *argv[])
 			return 3;
 		}
 		
-		printf ("%s\n", sid_string_static( sid ) );
+		printf ("%s\n", sid_string_tos( sid ) );
 		return 0;
 	}
 
-- 
cgit