summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-12-03 18:24:56 +0100
committerMichael Adam <obnox@samba.org>2007-12-19 23:08:00 +0100
commitfcee8ccdcdec341f758fb8aa30d5eb432430005d (patch)
tree7edbbedecb97e38849f7399255c978d75634b5ed /source3/modules
parent65b3065a4b31102e332de7d6008941847d5f97b3 (diff)
downloadsamba-fcee8ccdcdec341f758fb8aa30d5eb432430005d.tar.gz
samba-fcee8ccdcdec341f758fb8aa30d5eb432430005d.tar.bz2
samba-fcee8ccdcdec341f758fb8aa30d5eb432430005d.zip
Change aixjfs2_get_nfs4_acl() to take file name instead of fsp.
In preparation of the api change in api change in get_nt_acl(). Michael (This used to be commit 40a1438e17c462990e6b71b544c39f093236d5be)
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_aixacl2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 0cb40a2214..289f4af9e6 100644
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -98,7 +98,7 @@ static AIXJFS2_ACL_T *aixjfs2_getacl_alloc(const char *fname, acl_type_t *type)
return acl;
}
-static bool aixjfs2_get_nfs4_acl(files_struct *fsp,
+static bool aixjfs2_get_nfs4_acl(const char *name,
SMB4ACL_T **ppacl, bool *pretryPosix)
{
int32_t i;
@@ -108,15 +108,15 @@ static bool aixjfs2_get_nfs4_acl(files_struct *fsp,
nfs4_ace_int_t *jfs2_ace = NULL;
acl_type_t type;
- DEBUG(10,("jfs2 get_nt_acl invoked for %s\n", fsp->fsp_name));
+ DEBUG(10,("jfs2 get_nt_acl invoked for %s\n", name));
memset(&type, 0, sizeof(acl_type_t));
type.u64 = ACL_NFS4;
- pacl = aixjfs2_getacl_alloc(fsp->fsp_name, &type);
+ pacl = aixjfs2_getacl_alloc(name, &type);
if (pacl == NULL) {
DEBUG(9, ("aixjfs2_getacl_alloc failed for %s with %s\n",
- fsp->fsp_name, strerror(errno)));
+ name, strerror(errno)));
if (errno==ENOSYS)
*pretryPosix = True;
return False;
@@ -166,7 +166,7 @@ static NTSTATUS aixjfs2_get_nt_acl_common(files_struct *fsp,
bool retryPosix = False;
*ppdesc = NULL;
- result = aixjfs2_get_nfs4_acl(fsp, &pacl, &retryPosix);
+ result = aixjfs2_get_nfs4_acl(fsp->fsp_name, &pacl, &retryPosix);
if (retryPosix)
{
DEBUG(10, ("retrying with posix acl...\n"));