svn commit: samba r23004 - in branches: SAMBA_3_0_25/source/modules
SAMBA_3_0_26/source/modules
obnox at samba.org
obnox at samba.org
Fri May 18 20:57:02 GMT 2007
Author: obnox
Date: 2007-05-18 20:57:01 +0000 (Fri, 18 May 2007)
New Revision: 23004
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23004
Log:
Fix the build of the Tru64 ACL vfs module.
(This is r22918 in SAMBA_3_0.)
Where the heck did that smb_acl_permset_t come from?
I can't remember, but I am sure this built once...
Michael
Modified:
branches/SAMBA_3_0_25/source/modules/vfs_tru64acl.c
branches/SAMBA_3_0_26/source/modules/vfs_tru64acl.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/modules/vfs_tru64acl.c
===================================================================
--- branches/SAMBA_3_0_25/source/modules/vfs_tru64acl.c 2007-05-18 13:44:34 UTC (rev 23003)
+++ branches/SAMBA_3_0_25/source/modules/vfs_tru64acl.c 2007-05-18 20:57:01 UTC (rev 23004)
@@ -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);
Modified: branches/SAMBA_3_0_26/source/modules/vfs_tru64acl.c
===================================================================
--- branches/SAMBA_3_0_26/source/modules/vfs_tru64acl.c 2007-05-18 13:44:34 UTC (rev 23003)
+++ branches/SAMBA_3_0_26/source/modules/vfs_tru64acl.c 2007-05-18 20:57:01 UTC (rev 23004)
@@ -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);
More information about the samba-cvs
mailing list