summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-05-15 21:41:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:07 -0500
commite2dc669cda3f2173bab19ffb9f76d6b904d8c7e3 (patch)
tree50e04e70b84f4ef8cb88f0e8072d88b3de359777
parent4a413b304369df0650db8999ecdaff119582d5f7 (diff)
downloadsamba-e2dc669cda3f2173bab19ffb9f76d6b904d8c7e3.tar.gz
samba-e2dc669cda3f2173bab19ffb9f76d6b904d8c7e3.tar.bz2
samba-e2dc669cda3f2173bab19ffb9f76d6b904d8c7e3.zip
r22918: 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 (This used to be commit e55f952a1319de8743ddfe4993cc4c798b7aa725)
-rw-r--r--source3/modules/vfs_tru64acl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/modules/vfs_tru64acl.c b/source3/modules/vfs_tru64acl.c
index 6aa9557c28..0c2de36911 100644
--- a/source3/modules/vfs_tru64acl.c
+++ b/source3/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);