From: Stefan Metzmacher Date: Tue, 15 Oct 2019 12:00:29 +0000 (+0200) Subject: s3:vfs_nfs4acl_xattr: make use of lp_parm_substituted_string() X-Git-Tag: ldb-2.1.0~592 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6747ccc3b7ba14834bb2c62087203129f84feed;p=thirdparty%2Fsamba.git s3:vfs_nfs4acl_xattr: make use of lp_parm_substituted_string() Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c index d03079be831..f8cbe7964d1 100644 --- a/source3/modules/vfs_nfs4acl_xattr.c +++ b/source3/modules/vfs_nfs4acl_xattr.c @@ -476,6 +476,8 @@ static int nfs4acl_connect(struct vfs_handle_struct *handle, const char *service, const char *user) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); struct nfs4acl_config *config = NULL; const struct enum_list *default_acl_style_list = NULL; const char *default_xattr_name = NULL; @@ -551,7 +553,7 @@ static int nfs4acl_connect(struct vfs_handle_struct *handle, default_acl_style_list, DEFAULT_ACL_EVERYONE); - config->xattr_name = lp_parm_talloc_string(config, + config->xattr_name = lp_parm_substituted_string(config, lp_sub, SNUM(handle->conn), "nfs4acl_xattr", "xattr_name",