From b5c6964a50be03999432fa5620be39dcb7093ad8 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 7 Nov 2019 11:01:05 +0100 Subject: s3:param: make "servicename" a substituted option Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- source3/modules/vfs_recycle.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/modules/vfs_recycle.c') diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 46a4fcb16bf..6c8c6a76f30 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -454,6 +454,8 @@ static int recycle_unlink_internal(vfs_handle_struct *handle, const struct smb_filename *smb_fname, int flags) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); connection_struct *conn = handle->conn; char *path_name = NULL; char *temp_name = NULL; @@ -467,7 +469,7 @@ static int recycle_unlink_internal(vfs_handle_struct *handle, bool exist; int rc = -1; - repository = talloc_sub_full(NULL, lp_servicename(talloc_tos(), SNUM(conn)), + repository = talloc_sub_full(NULL, lp_servicename(talloc_tos(), lp_sub, SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, -- cgit v1.2.1