From: Ralph Boehme <slow@samba.org>
Date: Thu, 31 Oct 2019 15:56:47 +0000 (+0100)
Subject: smbdotconf: mark "abort shutdown script" with substitution="1"
X-Git-Tag: ldb-2.1.0~568
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db75b5d6fcc3dbdf10ceace57011ede629382da8;p=thirdparty%2Fsamba.git

smbdotconf: mark "abort shutdown script" with substitution="1"

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/docs-xml/smbdotconf/logon/abortshutdownscript.xml b/docs-xml/smbdotconf/logon/abortshutdownscript.xml
index d5f714202fe..7ce0f1fa7e5 100644
--- a/docs-xml/smbdotconf/logon/abortshutdownscript.xml
+++ b/docs-xml/smbdotconf/logon/abortshutdownscript.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="abort shutdown script"
                  context="G"
-				 type="string"
+                 type="string"
+                 substitution="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/source3/rpc_server/winreg/srv_winreg_nt.c b/source3/rpc_server/winreg/srv_winreg_nt.c
index e42f0ba203e..0fdfa285e38 100644
--- a/source3/rpc_server/winreg/srv_winreg_nt.c
+++ b/source3/rpc_server/winreg/srv_winreg_nt.c
@@ -611,10 +611,13 @@ WERROR _winreg_InitiateSystemShutdownEx(struct pipes_struct *p,
 WERROR _winreg_AbortSystemShutdown(struct pipes_struct *p,
 				   struct winreg_AbortSystemShutdown *r)
 {
-	const char *abort_shutdown_script = lp_abort_shutdown_script(talloc_tos());
+	const char *abort_shutdown_script = NULL;
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
 	int ret = -1;
 	bool can_shutdown = false;
 
+	abort_shutdown_script = lp_abort_shutdown_script(talloc_tos(), lp_sub);
 	if (!*abort_shutdown_script)
 		return WERR_ACCESS_DENIED;