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

r22918: Attempt to fix the build of the tru64acl module.

Browse Source 
Where the heck did that smb_acl_permset_t come from?
I can't remember...

Michael
(This used to be commit e55f952a1319de8743ddfe4993cc4c798b7aa725)
This commit is contained in:
Michael Adam 2007-05-15 21:41:02 +00:00 committed by Gerald (Jerry) Carter
parent 4a413b3043
commit e2dc669cda
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/modules/vfs_tru64acl.c
View File

@ -28,8 +28,8 @@ static BOOL tru64_ace_to_smb_ace(acl_entry_t tru64_ace,
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 @@ static BOOL tru64_ace_to_smb_ace(acl_entry_t tru64_ace,
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 @@ static SMB_ACL_TAG_T tru64_tag_to_smb(acl_tag_t tru64_tag)
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 @@ static acl_perm_t smb_permset_to_tru64(smb_acl_permset_t smb_permset)
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);