From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 17 Jul 2007 06:03:03 +0000 (+0000)
Subject: r23914: try to fix the build on Tru64
X-Git-Tag: samba-misc-tags/initial-v3-2-unstable~695
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8557b8b570ac8f8d3d14aaeb894c8b3532558736;p=thirdparty%2Fsamba.git

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 87b456a2f70..6286cd04145 100644
--- 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;