summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-04 08:27:02 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-04 08:27:02 +0000
commit1fb6f689e7d2534a5fe0a1232be7ea30be8f515e (patch)
tree68de7da9969b4754757f5f35b192593fbd9c8d38 /source3/smbd
parentce85e52eff9d8a61a58c559bdf4beb5e1284060d (diff)
downloadsamba-1fb6f689e7d2534a5fe0a1232be7ea30be8f515e.tar.gz
samba-1fb6f689e7d2534a5fe0a1232be7ea30be8f515e.tar.bz2
samba-1fb6f689e7d2534a5fe0a1232be7ea30be8f515e.zip
Merge from HEAD: avoid braindead #define on Tru64.
(This used to be commit 299233fbf2328d08546b3b03dceca67083b68493)
Diffstat (limited to 'source3/smbd')
-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;