summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorAlexander Werth <alexander.werth@de.ibm.com>2012-07-26 17:11:03 +0200
committerAndrew Bartlett <abartlet@samba.org>2013-05-09 06:18:21 +0200
commit7978fe25846ef2d61dc694dcb96085fbda6d038f (patch)
treebb63dc293e581f9de7cdb87700a3ebddcefbf8a7 /source3/modules
parentbe0e2692461831dada5f5a497189a81e409e88f0 (diff)
downloadsamba-7978fe25846ef2d61dc694dcb96085fbda6d038f.tar.gz
samba-7978fe25846ef2d61dc694dcb96085fbda6d038f.tar.bz2
samba-7978fe25846ef2d61dc694dcb96085fbda6d038f.zip
s3: Change smbacl4_get_vfs_params to use connection_struct instead of fsp.
Reviewed-By: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/nfs4_acls.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 9d0651b417..ceaeafbd71 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -68,7 +68,7 @@ typedef struct _smbacl4_vfs_params {
*/
static int smbacl4_get_vfs_params(
const char *type_name,
- files_struct *fsp,
+ struct connection_struct *conn,
smbacl4_vfs_params *params
)
{
@@ -87,12 +87,12 @@ static int smbacl4_get_vfs_params(
memset(params, 0, sizeof(smbacl4_vfs_params));
params->mode = (enum smbacl4_mode_enum)lp_parm_enum(
- SNUM(fsp->conn), type_name,
+ SNUM(conn), type_name,
"mode", enum_smbacl4_modes, e_simple);
- params->do_chown = lp_parm_bool(SNUM(fsp->conn), type_name,
+ params->do_chown = lp_parm_bool(SNUM(conn), type_name,
"chown", true);
params->acedup = (enum smbacl4_acedup_enum)lp_parm_enum(
- SNUM(fsp->conn), type_name,
+ SNUM(conn), type_name,
"acedup", enum_smbacl4_acedups, e_dontcare);
DEBUG(10, ("mode:%s, do_chown:%s, acedup: %s\n",
@@ -765,7 +765,8 @@ NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
}
/* Special behaviours */
- if (smbacl4_get_vfs_params(SMBACL4_PARAM_TYPE_NAME, fsp, &params)) {
+ if (smbacl4_get_vfs_params(SMBACL4_PARAM_TYPE_NAME,
+ fsp->conn, &params)) {
TALLOC_FREE(frame);
return NT_STATUS_NO_MEMORY;
}