Author: obnox Date: 2007-05-15 21:41:02 +0000 (Tue, 15 May 2007) New Revision: 22918
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22918 Log: Attempt to fix the build of the tru64acl module. Where the heck did that smb_acl_permset_t come from? I can't remember... Michael Modified: branches/SAMBA_3_0/source/modules/vfs_tru64acl.c Changeset: Modified: branches/SAMBA_3_0/source/modules/vfs_tru64acl.c =================================================================== --- branches/SAMBA_3_0/source/modules/vfs_tru64acl.c 2007-05-15 19:17:29 UTC (rev 22917) +++ branches/SAMBA_3_0/source/modules/vfs_tru64acl.c 2007-05-15 21:41:02 UTC (rev 22918) @@ -28,8 +28,8 @@ static acl_t smb_acl_to_tru64_acl(const SMB_ACL_T smb_acl); static acl_tag_t smb_tag_to_tru64(SMB_ACL_TAG_T smb_tag); static SMB_ACL_TAG_T tru64_tag_to_smb(acl_tag_t tru64_tag); -static acl_perm_t smb_permset_to_tru64(smb_acl_permset_t smb_permset); -static smb_acl_permset_t tru64_permset_to_smb(const acl_perm_t tru64_permset); +static acl_perm_t smb_permset_to_tru64(SMB_ACL_PERM_T smb_permset); +static SMB_ACL_PERM_T tru64_permset_to_smb(const acl_perm_t tru64_permset); /* public functions - the api */ @@ -201,7 +201,7 @@ acl_tag_t tru64_tag; acl_permset_t permset; SMB_ACL_TAG_T smb_tag_type; - smb_acl_permset_t smb_permset; + SMB_ACL_PERM_T smb_permset; void *qualifier; if (acl_get_tag_type(tru64_ace, &tru64_tag) != 0) { @@ -437,7 +437,7 @@ return smb_tag_type; } -static acl_perm_t smb_permset_to_tru64(smb_acl_permset_t smb_permset) +static acl_perm_t smb_permset_to_tru64(SMB_ACL_PERM_T smb_permset) { /* originally, I thought that acl_clear_perm was the * proper way to reset the permset to 0. but without @@ -456,9 +456,9 @@ return tru64_permset; } -static smb_acl_permset_t tru64_permset_to_smb(const acl_perm_t tru64_permset) +static SMB_ACL_PERM_T tru64_permset_to_smb(const acl_perm_t tru64_permset) { - smb_acl_permset_t smb_permset = 0; + SMB_ACL_PERM_T smb_permset = 0; smb_permset |= ((tru64_permset & ACL_READ) ? SMB_ACL_READ : 0); smb_permset |= ((tru64_permset & ACL_WRITE) ? SMB_ACL_WRITE : 0); smb_permset |= ((tru64_permset & ACL_EXECUTE) ? SMB_ACL_EXECUTE : 0);
