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 <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 1b293ddb1b0af3bea0662e2d78c17c297e674f45..28363f003c225ebda6938aa14d651954fa2904a7 100644 (file)
--- 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 95f32f9d0a6086ff0a656198fbae44031fd798ea..3aa66c270e18ed48cd937a1a69e0b0c245bc4892 100644 (file)
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -366,7 +366,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 f0d5074d36b509381d20910910dad2f88bdf13cb..2284849617808fc2e5ab65026cb15348df25f8d4 100644 (file)
--- 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 ff44fe391f426336b1505e6a529b60addbe0c736..878362442222fccbea2cf48726ffb316691eaff2 100644 (file)
--- 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 smbXsrv_connection *xconn = req->xconn;
        struct smbd_server_connection *sconn = req->sconn;
        files_struct *fsp = NULL;

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 7f4ba8cafa983f53b793f0d6b486aa86971ae707..6ecd467a321497daca70e6293b1c2af55d5f4c0a 100644 (file)
--- 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 smbd_server_connection *sconn = req->sconn;
        uint32_t ucf_flags = UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP |
                        ucf_flags_from_smb_request(req);
@@ -3193,7 +3193,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 smbd_server_connection *sconn = req->sconn;
        bool backup_priv = false;