diff options
| author | Volker Lendecke <vl@samba.org> | 2015-08-11 14:20:07 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2015-08-13 17:45:31 +0200 |
| commit | b5ce90e609164923dd3bb22d16e94ef998f08426 (patch) | |
| tree | a6acf5a6e75aad5ba78bf33b51aeb298b69bfeaf /source3/modules/nfs4_acls.c | |
| parent | 173dca482b87c10bc68c8c2f55a9983f15e04c73 (diff) | |
| download | samba-b5ce90e609164923dd3bb22d16e94ef998f08426.tar.gz | |
nfs4acls: Remove type_name param from smbacl4_get_vfs_params
It is kindof unexpected that we get params for something else but
"nfs4:"
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Aug 13 17:45:31 CEST 2015 on sn-devel-104
Diffstat (limited to 'source3/modules/nfs4_acls.c')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index b3034f978cb..26a98b72471 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -65,7 +65,6 @@ typedef struct _smbacl4_vfs_params { * Gather special parameters for NFS4 ACL handling */ static int smbacl4_get_vfs_params( - const char *type_name, struct connection_struct *conn, smbacl4_vfs_params *params ) @@ -86,21 +85,23 @@ static int smbacl4_get_vfs_params( ZERO_STRUCTP(params); - enumval = lp_parm_enum(SNUM(conn), type_name, "mode", + enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "mode", enum_smbacl4_modes, e_simple); if (enumval == -1) { - DEBUG(10, ("value for %s:mode unknown\n", type_name)); + DEBUG(10, ("value for %s:mode unknown\n", + SMBACL4_PARAM_TYPE_NAME)); return -1; } params->mode = (enum smbacl4_mode_enum)enumval; - params->do_chown = lp_parm_bool(SNUM(conn), type_name, + params->do_chown = lp_parm_bool(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "chown", true); - enumval = lp_parm_enum(SNUM(conn), type_name, "acedup", + enumval = lp_parm_enum(SNUM(conn), SMBACL4_PARAM_TYPE_NAME, "acedup", enum_smbacl4_acedups, e_dontcare); if (enumval == -1) { - DEBUG(10, ("value for %s:acedup unknown\n", type_name)); + DEBUG(10, ("value for %s:acedup unknown\n", + SMBACL4_PARAM_TYPE_NAME)); return -1; } params->acedup = (enum smbacl4_acedup_enum)enumval; @@ -547,7 +548,7 @@ NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp, } /* Special behaviours */ - if (smbacl4_get_vfs_params(SMBACL4_PARAM_TYPE_NAME, fsp->conn, ¶ms)) { + if (smbacl4_get_vfs_params(fsp->conn, ¶ms)) { return NT_STATUS_NO_MEMORY; } @@ -572,7 +573,7 @@ NTSTATUS smb_get_nt_acl_nfs4(struct connection_struct *conn, } /* Special behaviours */ - if (smbacl4_get_vfs_params(SMBACL4_PARAM_TYPE_NAME, conn, ¶ms)) { + if (smbacl4_get_vfs_params(conn, ¶ms)) { return NT_STATUS_NO_MEMORY; } @@ -929,8 +930,7 @@ 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->conn, ¶ms)) { + if (smbacl4_get_vfs_params(fsp->conn, ¶ms)) { TALLOC_FREE(frame); return NT_STATUS_NO_MEMORY; } |