svn commit: samba r24634 - in branches/SAMBA_3_0_25/source/smbd: .

vlendec at samba.org vlendec at samba.org
Thu Aug 23 12:23:20 GMT 2007


Author: vlendec
Date: 2007-08-23 12:23:19 +0000 (Thu, 23 Aug 2007)
New Revision: 24634

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

Log:
Fix the Tru64 build -- 3_2[_0] is already fixed
Modified:
   branches/SAMBA_3_0_25/source/smbd/posix_acls.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/posix_acls.c	2007-08-23 11:52:54 UTC (rev 24633)
+++ branches/SAMBA_3_0_25/source/smbd/posix_acls.c	2007-08-23 12:23:19 UTC (rev 24634)
@@ -3107,7 +3107,7 @@
 {
 	mode_t perms;
 	SEC_ACCESS acc;
-	int acl_type;
+	int nt_acl_type; /* Tru64 has "acl_type" as a macro.. */
 	DOM_SID trustee;
 
 	switch (ugw) {
@@ -3136,13 +3136,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;



More information about the samba-cvs mailing list