summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-04 08:26:04 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-04 08:26:04 +0000
commit89152846b71793790c955234f77e376cd73a60c2 (patch)
tree6ddc8da401903552e027529fdf3ec11e88db40c6
parent349c83f243e4e7309569a6d428825c8a25214a5e (diff)
downloadsamba-89152846b71793790c955234f77e376cd73a60c2.tar.gz
samba-89152846b71793790c955234f77e376cd73a60c2.tar.bz2
samba-89152846b71793790c955234f77e376cd73a60c2.zip
Patch from Edmund Lam <epl@unimelb.edu.au> to fix braindead Tru64 behaviour:
Apparently acl_type is #defined to acl_common.entry_type in their acl.h.... Andrew Bartlett (This used to be commit 3dfdaa0208ee538631378aa921300d95c596b70c)
-rw-r--r--source3/smbd/posix_acls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 22bb7fe76b..5069db8097 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1551,7 +1551,7 @@ static void arrange_posix_perms( char *filename, canon_ace **pp_list_head)
****************************************************************************/
static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_STRUCT_STAT *psbuf,
- DOM_SID *powner, DOM_SID *pgroup, SMB_ACL_TYPE_T acl_type)
+ DOM_SID *powner, DOM_SID *pgroup, SMB_ACL_TYPE_T the_acl_type)
{
extern DOM_SID global_sid_World;
connection_struct *conn = fsp->conn;
@@ -1603,7 +1603,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
* entries out of the blue when setting ACLs, so a get/set
* cycle will drop them.
*/
- if (acl_type == SMB_ACL_TYPE_ACCESS && *puid == psbuf->st_uid)
+ if (the_acl_type == SMB_ACL_TYPE_ACCESS && *puid == psbuf->st_uid)
continue;
uid_to_sid( &sid, *puid);
unix_ug.uid = *puid;