sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00
Code

Merge from HEAD: avoid braindead #define on Tru64.

Browse Source 
(This used to be commit 299233fbf2328d08546b3b03dceca67083b68493)
This commit is contained in:
Andrew Bartlett 2003-02-04 08:27:02 +00:00
parent ce85e52eff
commit 1fb6f689e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/posix_acls.c
View File

@ -1551,7 +1551,7 @@ static void arrange_posix_perms( char *filename, canon_ace **pp_list_head)
****************************************************************************/
static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_STRUCT_STAT *psbuf,
DOM_SID *powner, DOM_SID *pgroup, SMB_ACL_TYPE_T acl_type)
DOM_SID *powner, DOM_SID *pgroup, SMB_ACL_TYPE_T the_acl_type)
{
extern DOM_SID global_sid_World;
connection_struct *conn = fsp->conn;
@ -1603,7 +1603,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
* entries out of the blue when setting ACLs, so a get/set
* cycle will drop them.
*/
if (acl_type == SMB_ACL_TYPE_ACCESS && *puid == psbuf->st_uid)
if (the_acl_type == SMB_ACL_TYPE_ACCESS && *puid == psbuf->st_uid)
continue;
uid_to_sid( &sid, *puid);
unix_ug.uid = *puid;