r23914: try to fix the build on Tru64

/usr/include/sys/acl.h:#define acl_type acl_common.entry_type
was the problem...

metze

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 87b456a2f70a993da2ff073ee8d6a39f5097ade5..6286cd04145fb40a7fa209a8714b96a53a63da72 100644 (file)
--- a/source/smbd/posix_acls.c
+++ b/source/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;