sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Replace bool flags inside ensure_canon_entry_valid() with pointers.

Browse Source 
This will make the second tweak to the ACL mapping on set easier.
This commit is contained in:
Jeremy Allison 2012-02-03 15:28:22 -08:00
parent 45a3b14bea
commit 41152d7157
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/smbd/posix_acls.c
View File

@ -1362,9 +1362,8 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
bool setting_acl) bool setting_acl)
{ {
canon_ace *pace; canon_ace *pace;
bool got_user = False; canon_ace *pace_user = NULL;
bool got_grp = False; canon_ace *pace_group = NULL;
bool got_other = False;
canon_ace *pace_other = NULL; canon_ace *pace_other = NULL;
for (pace = *pp_ace; pace; pace = pace->next) { for (pace = *pp_ace; pace; pace = pace->next) {
@ -1372,7 +1371,7 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
if (setting_acl) if (setting_acl)
apply_default_perms(params, is_directory, pace, S_IRUSR); apply_default_perms(params, is_directory, pace, S_IRUSR);
got_user = True; pace_user = pace;
} else if (pace->type == SMB_ACL_GROUP_OBJ) { } else if (pace->type == SMB_ACL_GROUP_OBJ) {
@ -1382,7 +1381,7 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
if (setting_acl) if (setting_acl)
apply_default_perms(params, is_directory, pace, S_IRGRP); apply_default_perms(params, is_directory, pace, S_IRGRP);
got_grp = True; pace_group = pace;
} else if (pace->type == SMB_ACL_OTHER) { } else if (pace->type == SMB_ACL_OTHER) {
@ -1392,12 +1391,11 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
if (setting_acl) if (setting_acl)
apply_default_perms(params, is_directory, pace, S_IROTH); apply_default_perms(params, is_directory, pace, S_IROTH);
got_other = True;
pace_other = pace; pace_other = pace;
} }
} }
if (!got_user) { if (!pace_user) {
if ((pace = talloc(talloc_tos(), canon_ace)) == NULL) { if ((pace = talloc(talloc_tos(), canon_ace)) == NULL) {
DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n")); DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
return False; return False;
@ -1433,7 +1431,7 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
if (pace->perms == 0) { if (pace->perms == 0) {
/* If we only got an "everyone" perm, just use that. */ /* If we only got an "everyone" perm, just use that. */
if (got_other) if (pace_other)
pace->perms = pace_other->perms; pace->perms = pace_other->perms;
} }
@ -1443,9 +1441,10 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
} }
DLIST_ADD(*pp_ace, pace); DLIST_ADD(*pp_ace, pace);
pace_user = pace;
} }
if (!got_grp) { if (!pace_group) {
if ((pace = talloc(talloc_tos(), canon_ace)) == NULL) { if ((pace = talloc(talloc_tos(), canon_ace)) == NULL) {
DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n")); DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
return False; return False;
@ -1459,7 +1458,7 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
pace->attr = ALLOW_ACE; pace->attr = ALLOW_ACE;
if (setting_acl) { if (setting_acl) {
/* If we only got an "everyone" perm, just use that. */ /* If we only got an "everyone" perm, just use that. */
if (got_other) if (pace_other)
pace->perms = pace_other->perms; pace->perms = pace_other->perms;
else else
pace->perms = 0; pace->perms = 0;
@ -1469,9 +1468,10 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
} }
DLIST_ADD(*pp_ace, pace); DLIST_ADD(*pp_ace, pace);
pace_group = pace;
} }
if (!got_other) { if (!pace_other) {
if ((pace = talloc(talloc_tos(), canon_ace)) == NULL) { if ((pace = talloc(talloc_tos(), canon_ace)) == NULL) {
DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n")); DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
return False; return False;
@ -1490,6 +1490,7 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IROTH, S_IWOTH, S_IXOTH); pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IROTH, S_IWOTH, S_IXOTH);
DLIST_ADD(*pp_ace, pace); DLIST_ADD(*pp_ace, pace);
pace_other = pace;
} }
return True; return True;