summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-07-17 06:03:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:41 -0500
commit63e93ad01274f34617bacd56d0e43cb0b81475c9 (patch)
tree0faf36ca6e8b656b4e3643d012355ac22ab3530b /source3/smbd
parent1ffa14ff923ab5790e55bcedee9f10203cf8dfad (diff)
downloadsamba-63e93ad01274f34617bacd56d0e43cb0b81475c9.tar.gz
samba-63e93ad01274f34617bacd56d0e43cb0b81475c9.tar.bz2
samba-63e93ad01274f34617bacd56d0e43cb0b81475c9.zip
r23914: try to fix the build on Tru64
/usr/include/sys/acl.h:#define acl_type acl_common.entry_type was the problem... metze (This used to be commit 8557b8b570ac8f8d3d14aaeb894c8b3532558736)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/posix_acls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 87b456a2f7..6286cd0414 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3111,7 +3111,7 @@ static NTSTATUS append_ugw_ace(files_struct *fsp,
{
mode_t perms;
SEC_ACCESS acc;
- int acl_type;
+ int nt_acl_type;
DOM_SID trustee;
switch (ugw) {
@@ -3140,13 +3140,13 @@ static NTSTATUS append_ugw_ace(files_struct *fsp,
return NT_STATUS_INVALID_PARAMETER;
}
acc = map_canon_ace_perms(SNUM(fsp->conn),
- &acl_type,
+ &nt_acl_type,
perms,
fsp->is_directory);
init_sec_ace(se,
&trustee,
- acl_type,
+ nt_acl_type,
acc,
0);
return NT_STATUS_OK;