diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-21 21:17:21 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-05-21 21:17:21 +0000 |
| commit | 34059e63c8a644b10cf9a59cca5e67a45053d16e (patch) | |
| tree | b0751d47f93023938656df3c6173618dfef4f1e5 /source/modules/vfs_tru64acl.c | |
| parent | c3f0e56c057f6be60bd3721485f013ed63defa6a (diff) | |
| download | samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.tar.gz samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.tar.xz samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.zip | |
r23052: sync with SAMBA_3_0_25 and start updating release notes
Diffstat (limited to 'source/modules/vfs_tru64acl.c')
| -rw-r--r-- | source/modules/vfs_tru64acl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/modules/vfs_tru64acl.c b/source/modules/vfs_tru64acl.c index 6aa9557c28c..0c2de36911f 100644 --- a/source/modules/vfs_tru64acl.c +++ b/source/modules/vfs_tru64acl.c @@ -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); |