From fe9a5f24be97f1e61ff85a4f6090bd412ae38d73 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Mon, 5 Aug 2019 10:59:22 +0200 Subject: [PATCH] s3:smbd: Incomplete conversion of former parametric options BUG: https://bugzilla.samba.org/show_bug.cgi?id=14069 RN: Incomplete conversion of former parametric options Signed-off-by: Ralph Boehme Reviewed-by: Volker Lendecke (backported from commit ea17bd5539eb0be7a446b99c8b6baa4aa1ab273f) --- source3/modules/vfs_ceph.c | 2 +- source3/modules/vfs_glusterfs.c | 2 +- source3/modules/vfs_gpfs.c | 2 +- source3/smbd/reply.c | 4 ++-- source3/smbd/trans2.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index 1b293ddb1b0..28363f003c2 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -146,7 +146,7 @@ static int cephwrap_connect(struct vfs_handle_struct *handle, const char *servi /* * Unless we have an async implementation of getxattrat turn this off. */ - lp_do_parameter(SNUM(handle->conn), "smbd:async dosmode", "false"); + lp_do_parameter(SNUM(handle->conn), "smbd async dosmode", "false"); return 0; diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index afb34b4b47c..8827bf018ab 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -367,7 +367,7 @@ static int vfs_gluster_connect(struct vfs_handle_struct *handle, /* * Unless we have an async implementation of getxattrat turn this off. */ - lp_do_parameter(SNUM(handle->conn), "smbd:async dosmode", "false"); + lp_do_parameter(SNUM(handle->conn), "smbd async dosmode", "false"); done: if (ret < 0) { diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index f0d5074d36b..22848496178 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -2195,7 +2195,7 @@ static int vfs_gpfs_connect(struct vfs_handle_struct *handle, * Unless we have an async implementation of get_dos_attributes turn * this off. */ - lp_do_parameter(SNUM(handle->conn), "smbd:async dosmode", "false"); + lp_do_parameter(SNUM(handle->conn), "smbd async dosmode", "false"); return 0; } diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 35d1ae772d5..65ac729c732 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1386,7 +1386,7 @@ void reply_getatr(struct smb_request *req) const char *p; NTSTATUS status; TALLOC_CTX *ctx = talloc_tos(); - bool ask_sharemode = lp_parm_bool(SNUM(conn), "smbd", "search ask sharemode", true); + bool ask_sharemode = lp_smbd_search_ask_sharemode(SNUM(conn)); START_PROFILE(SMBgetatr); @@ -1769,7 +1769,7 @@ void reply_search(struct smb_request *req) bool mask_contains_wcard = False; bool allow_long_path_components = (req->flags2 & FLAGS2_LONG_PATH_COMPONENTS) ? True : False; TALLOC_CTX *ctx = talloc_tos(); - bool ask_sharemode = lp_parm_bool(SNUM(conn), "smbd", "search ask sharemode", true); + bool ask_sharemode = lp_smbd_search_ask_sharemode(SNUM(conn)); struct dptr_struct *dirptr = NULL; struct smbXsrv_connection *xconn = req->xconn; struct smbd_server_connection *sconn = req->sconn; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 0539b35bb73..b0616f15ade 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2710,7 +2710,7 @@ static void call_trans2findfirst(connection_struct *conn, bool mask_contains_wcard = False; struct ea_list *ea_list = NULL; NTSTATUS ntstatus = NT_STATUS_OK; - bool ask_sharemode = lp_parm_bool(SNUM(conn), "smbd", "search ask sharemode", true); + bool ask_sharemode = lp_smbd_search_ask_sharemode(SNUM(conn)); struct dptr_struct *dirptr = NULL; struct smbd_server_connection *sconn = req->sconn; uint32_t ucf_flags = UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP | @@ -3126,7 +3126,7 @@ static void call_trans2findnext(connection_struct *conn, int space_remaining; struct ea_list *ea_list = NULL; NTSTATUS ntstatus = NT_STATUS_OK; - bool ask_sharemode = lp_parm_bool(SNUM(conn), "smbd", "search ask sharemode", true); + bool ask_sharemode = lp_smbd_search_ask_sharemode(SNUM(conn)); TALLOC_CTX *ctx = talloc_tos(); struct dptr_struct *dirptr; struct smbd_server_connection *sconn = req->sconn; -- 2.21.0