svn commit: samba r23915 - in branches/SAMBA_3_2_0/source/smbd: .

[metze at samba.org]

Author: metze
Date: 2007-07-17 06:03:44 +0000 (Tue, 17 Jul 2007)
New Revision: 23915

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23915

Log:
merge from SAMBA_3_2:
try to fix the build on Tru64

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

metze
Modified:
   branches/SAMBA_3_2_0/source/smbd/posix_acls.c


Changeset:
Modified: branches/SAMBA_3_2_0/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/posix_acls.c	2007-07-17 06:03:03 UTC (rev 23914)
+++ branches/SAMBA_3_2_0/source/smbd/posix_acls.c	2007-07-17 06:03:44 UTC (rev 23915)
@@ -3111,7 +3111,7 @@
 {
 	mode_t perms;
 	SEC_ACCESS acc;
-	int acl_type;
+	int nt_acl_type;
 	DOM_SID trustee;
 
 	switch (ugw) {
@@ -3140,13 +3140,13 @@
 			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;