Attachment 161651 Details for Bug 252447 – Proposed patch

[patch] Proposed patch

acl-2.2.24-pseudoperm.patch (text/plain), 5.76 KB, created by Jiri Moskovcak on 2007-08-16 12:59:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Moskovcak

Created: 2007-08-16 12:59:04 UTC

Size: 5.76 KB

patch

obsolete

>--- acl-2.2.24.orig/setfacl/do_set.c
>+++ acl-2.2.24/setfacl/do_set.c
>@@ -100,7 +100,6 @@ has_execute_perms(
> 	}
> }
> 
>-
> int
> clone_entry(
> 	acl_t from_acl,
>@@ -146,24 +145,23 @@ print_test(
> static void
> set_perm(
> 	acl_entry_t ent,
>-	mode_t add,
>-	mode_t remove)
>+	mode_t perm)
> {
> 	acl_permset_t set;
> 
> 	acl_get_permset(ent, &set);
>-	if (remove & CMD_PERM_READ)
>-		acl_delete_perm(set, ACL_READ);
>-	if (remove & CMD_PERM_WRITE)
>-		acl_delete_perm(set, ACL_WRITE);
>-	if (remove & CMD_PERM_EXECUTE)
>-		acl_delete_perm(set, ACL_EXECUTE);
>-	if (add & CMD_PERM_READ)
>+	if (perm & CMD_PERM_READ)
> 		acl_add_perm(set, ACL_READ);
>-	if (add & CMD_PERM_WRITE)
>+	else
>+		acl_delete_perm(set, ACL_READ);
>+	if (perm & CMD_PERM_WRITE)
> 		acl_add_perm(set, ACL_WRITE);
>-	if (add & CMD_PERM_EXECUTE)
>+	else
>+		acl_delete_perm(set, ACL_WRITE);
>+	if (perm & CMD_PERM_EXECUTE)
> 		acl_add_perm(set, ACL_EXECUTE);
>+	else
>+		acl_delete_perm(set, ACL_EXECUTE);
> }
> 
> 
>@@ -280,6 +278,8 @@ do_set(
> 	if (error == 0)
> 		return 0;
> 	while (error == 1) {
>+		mode_t perm = cmd->c_perm;
>+
> 		if (cmd->c_type == ACL_TYPE_ACCESS) {
> 			xacl = &acl;
> 			old_xacl = &old_acl;
>@@ -297,10 +297,10 @@ do_set(
> 		RETRIEVE_ACL(cmd->c_type);
> 
> 		/* Check for `X', and replace with `x' as appropriate. */
>-		if (cmd->c_perm & CMD_PERM_COND_EXECUTE) {
>-			cmd->c_perm &= ~CMD_PERM_COND_EXECUTE;
>+		if (perm & CMD_PERM_COND_EXECUTE) {
>+			perm &= ~CMD_PERM_COND_EXECUTE;
> 			if (S_ISDIR(st->st_mode) || has_execute_perms(*xacl))
>-				cmd->c_perm |= CMD_PERM_EXECUTE;
>+				perm |= CMD_PERM_EXECUTE;
> 		}
> 
> 		switch(cmd->c_cmd) {
>@@ -314,19 +314,7 @@ do_set(
> 						acl_set_qualifier(ent,
> 								  &cmd->c_id);
> 				}
>-				set_perm(ent, cmd->c_perm, ~cmd->c_perm);
>-				break;
>-
>-			case CMD_ENTRY_ADD:
>-				ent = find_entry(*xacl, cmd->c_tag, cmd->c_id);
>-				if (ent)
>-					set_perm(ent, cmd->c_perm, 0);
>-				break;
>-
>-			case CMD_ENTRY_SUBTRACT:
>-				ent = find_entry(*xacl, cmd->c_tag, cmd->c_id);
>-				if (ent)
>-					set_perm(ent, 0, cmd->c_perm);
>+				set_perm(ent, perm);
> 				break;
> 
> 			case CMD_REMOVE_ENTRY:
> 			
> 			
>--- acl-2.2.24.orig/setfacl/parse.c
>+++ acl-2.2.24/setfacl/parse.c
>@@ -291,19 +291,6 @@ user_entry:
> 	if (!(parse_mode & SEQ_PARSE_WITH_PERM))
> 		return cmd;
> 
>-	if (parse_mode & SEQ_PARSE_WITH_RELATIVE) {
>-		if (**text_p == '+') {
>-			(*text_p)++;
>-			cmd->c_cmd = CMD_ENTRY_ADD;
>-		} else if (**text_p == '^') {
>-			(*text_p)++;
>-			cmd->c_cmd = CMD_ENTRY_SUBTRACT;
>-		} else {
>-			if (!(parse_mode & SEQ_PARSE_NO_RELATIVE))
>-				goto fail;
>-		}
>-	}
>-
> 	/* parse permissions */
> 	SKIP_WS(*text_p);
> 	if (**text_p >= '0' && **text_p <= '7') {
> 	
> 	
>--- acl-2.2.24.orig/setfacl/parse.h
>+++ acl-2.2.24/setfacl/parse.h
>@@ -40,10 +40,6 @@ extern "C" {
> #define SEQ_PARSE_NO_PERM	(0x0002)
> #define SEQ_PARSE_ANY_PERM	(0x0001|0x0002)
> 
>-#define SEQ_PARSE_WITH_RELATIVE	(0x0004)
>-#define SEQ_PARSE_NO_RELATIVE	(0x0008)
>-#define SEQ_PARSE_ANY_RELATIVE	(0x0004|0x0008)
>-
> #define SEQ_PARSE_MULTI		(0x0010)
> #define SEQ_PARSE_DEFAULT	(0x0020)	/* "default:" = default acl */
> 
> 
> 
>--- acl-2.2.24.orig/setfacl/sequence.h
>+++ acl-2.2.24/setfacl/sequence.h
>@@ -55,8 +55,6 @@ typedef struct seq_obj *seq_t;
> 
> /* command types */
> #define CMD_ENTRY_REPLACE	(0)
>-#define CMD_ENTRY_ADD		(1)
>-#define CMD_ENTRY_SUBTRACT	(2)
> #define CMD_REMOVE_ENTRY	(3)
> #define CMD_REMOVE_EXTENDED_ACL	(4)
> #define CMD_REMOVE_ACL		(5)
> 
> 
>--- acl-2.2.24.orig/setfacl/setfacl.c
>+++ acl-2.2.24/setfacl/setfacl.c
>@@ -169,7 +169,6 @@ restore(
> 
> 		error = read_acl_seq(file, seq, CMD_ENTRY_REPLACE,
> 		                     SEQ_PARSE_WITH_PERM |
>-				     SEQ_PARSE_NO_RELATIVE |
> 				     SEQ_PARSE_DEFAULT |
> 				     SEQ_PARSE_MULTI,
> 				     &line, NULL);
>@@ -450,33 +449,23 @@ int main(int argc, char *argv[])
> 				seq_remove_default_acl_cmd = seq->s_last;
> 
> 				seq_cmd = CMD_ENTRY_REPLACE;
>-				parse_mode = SEQ_PARSE_WITH_PERM |
>-				             SEQ_PARSE_NO_RELATIVE;
>+				parse_mode = SEQ_PARSE_WITH_PERM;
> 				goto set_modify_delete;
> 
> 			case 'm':  /* modify */
> 				seq_cmd = CMD_ENTRY_REPLACE;
> 				parse_mode = SEQ_PARSE_WITH_PERM;
>-#if POSIXLY_CORRECT || 1
>-				parse_mode |= SEQ_PARSE_NO_RELATIVE;
>-#else
>-				if (posixly_correct)
>-					parse_mode |= SEQ_PARSE_NO_RELATIVE;
>-				else
>-					parse_mode |= SEQ_PARSE_ANY_RELATIVE;
>-#endif
> 				goto set_modify_delete;
> 
> 			case 'x':  /* delete */
> 				seq_cmd = CMD_REMOVE_ENTRY;
>-				parse_mode = SEQ_PARSE_NO_RELATIVE;
> #if POSIXLY_CORRECT
>-				parse_mode |= SEQ_PARSE_ANY_PERM;
>+				parse_mode = SEQ_PARSE_ANY_PERM;
> #else
> 				if (posixly_correct)
>-					parse_mode |= SEQ_PARSE_ANY_PERM;
>+					parse_mode = SEQ_PARSE_ANY_PERM;
> 				else
>-					parse_mode |= SEQ_PARSE_NO_PERM;
>+					parse_mode = SEQ_PARSE_NO_PERM;
> #endif
> 				goto set_modify_delete;
> 
>@@ -518,33 +507,23 @@ int main(int argc, char *argv[])
> 				seq_remove_default_acl_cmd = seq->s_last;
> 
> 				seq_cmd = CMD_ENTRY_REPLACE;
>-				parse_mode = SEQ_PARSE_WITH_PERM |
>-				             SEQ_PARSE_NO_RELATIVE;
>+				parse_mode = SEQ_PARSE_WITH_PERM;
> 				goto set_modify_delete_from_file;
> 
> 			case 'M':  /* modify from file */
> 				seq_cmd = CMD_ENTRY_REPLACE;
> 				parse_mode = SEQ_PARSE_WITH_PERM;
>-#if POSIXLY_CORRECT || 1
>-				parse_mode |= SEQ_PARSE_NO_RELATIVE;
>-#else
>-				if (posixly_correct)
>-					parse_mode |= SEQ_PARSE_NO_RELATIVE;
>-				else
>-					parse_mode |= SEQ_PARSE_ANY_RELATIVE;
>-#endif
> 				goto set_modify_delete_from_file;
> 
> 			case 'X':  /* delete from file */
> 				seq_cmd = CMD_REMOVE_ENTRY;
>-				parse_mode = SEQ_PARSE_NO_RELATIVE;
> #if POSIXLY_CORRECT
>-				parse_mode |= SEQ_PARSE_ANY_PERM;
>+				parse_mode = SEQ_PARSE_ANY_PERM;
> #else
> 				if (posixly_correct)
>-					parse_mode |= SEQ_PARSE_ANY_PERM;
>+					parse_mode = SEQ_PARSE_ANY_PERM;
> 				else
>-					parse_mode |= SEQ_PARSE_NO_PERM;
>+					parse_mode = SEQ_PARSE_NO_PERM;
> #endif
> 				goto set_modify_delete_from_file;
>

Actions: View | Diff

Attachments on bug 252447: 161651