From d89ccfc1c7d23b6e2a3bc80c1acd189000ca7cbd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 12 Jan 2021 11:39:51 -0800 Subject: [PATCH] s3: smbd: Factor out setting up case parameters for a share to a function - conn_setup_case_options(). Will allow it to be reused in the msdfs temporary share code. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14612 Signed-off-by: Jeremy Allison Reviewed-by: Anoop C S (cherry picked from commit ab7700177c2badbf8ed649985be8029223b6e946) --- source3/smbd/conn.c | 19 +++++++++++++++++++ source3/smbd/proto.h | 1 + source3/smbd/service.c | 11 +---------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c index 6d9ea419f8d..6a94d344f12 100644 --- a/source3/smbd/conn.c +++ b/source3/smbd/conn.c @@ -228,3 +228,22 @@ void conn_free(connection_struct *conn) conn_free_internal(conn); } + +/* + * Correctly initialize a share with case options. + */ +void conn_setup_case_options(connection_struct *conn) +{ + int snum = conn->params->service; + + if (lp_case_sensitive(snum) == Auto) { + /* We will be setting this per packet. Set to be case + * insensitive for now. */ + conn->case_sensitive = false; + } else { + conn->case_sensitive = (bool)lp_case_sensitive(snum); + } + + conn->case_preserve = lp_preserve_case(snum); + conn->short_case_preserve = lp_short_preserve_case(snum); +} diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 2ea90405b47..206406a9fe9 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -154,6 +154,7 @@ connection_struct *conn_new(struct smbd_server_connection *sconn); bool conn_idle_all(struct smbd_server_connection *sconn, time_t t); void conn_clear_vuid_caches(struct smbd_server_connection *sconn, uint64_t vuid); void conn_free(connection_struct *conn); +void conn_setup_case_options(connection_struct *conn); void conn_force_tdis( struct smbd_server_connection *sconn, bool (*check_fn)(struct connection_struct *conn, diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 03125a30dad..bf5e474ddff 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -569,16 +569,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn, ( lp_enable_asu_support() && strequal(dev,"ADMIN$")) ); /* Case options for the share. */ - if (lp_case_sensitive(snum) == Auto) { - /* We will be setting this per packet. Set to be case - * insensitive for now. */ - conn->case_sensitive = False; - } else { - conn->case_sensitive = (bool)lp_case_sensitive(snum); - } - - conn->case_preserve = lp_preserve_case(snum); - conn->short_case_preserve = lp_short_preserve_case(snum); + conn_setup_case_options(conn); conn->encrypt_level = lp_smb_encrypt(snum); if (conn->encrypt_level > SMB_SIGNING_OFF) { -- 2.47.2