From: Ralph Boehme Date: Mon, 4 Nov 2019 12:58:28 +0000 (+0100) Subject: smbdotconf: mark "add share command" with substitution="1" X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=390f53cb038ad2f64cb3eae295643656b431b12f;p=bbaumbach%2Fsamba-autobuild%2F.git smbdotconf: mark "add share command" with substitution="1" Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- diff --git a/docs-xml/smbdotconf/misc/addsharecommand.xml b/docs-xml/smbdotconf/misc/addsharecommand.xml index 6bbdef61967..484b591c439 100644 --- a/docs-xml/smbdotconf/misc/addsharecommand.xml +++ b/docs-xml/smbdotconf/misc/addsharecommand.xml @@ -1,6 +1,7 @@ diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index 65f0f1ffa47..b3c9211f7a4 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -1992,6 +1992,8 @@ WERROR _srvsvc_NetShareAdd(struct pipes_struct *p, int max_connections = 0; SMB_STRUCT_STAT st; TALLOC_CTX *ctx = p->mem_ctx; + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); DEBUG(5,("_srvsvc_NetShareAdd: %d\n", __LINE__)); @@ -2004,7 +2006,7 @@ WERROR _srvsvc_NetShareAdd(struct pipes_struct *p, if (p->session_info->unix_token->uid != sec_initial_uid() && !is_disk_op ) return WERR_ACCESS_DENIED; - if (!lp_add_share_command(talloc_tos()) || !*lp_add_share_command(talloc_tos())) { + if (!lp_add_share_command(talloc_tos(), lp_sub) || !*lp_add_share_command(talloc_tos(), lp_sub)) { DBG_WARNING("_srvsvc_NetShareAdd: No \"add share command\" parameter set in smb.conf.\n"); return WERR_ACCESS_DENIED; } @@ -2110,7 +2112,7 @@ WERROR _srvsvc_NetShareAdd(struct pipes_struct *p, command = talloc_asprintf(ctx, "%s \"%s\" \"%s\" \"%s\" \"%s\" %d", - lp_add_share_command(talloc_tos()), + lp_add_share_command(talloc_tos(), lp_sub), get_dyn_CONFIGFILE(), share_name_in, path,