From db75b5d6fcc3dbdf10ceace57011ede629382da8 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 31 Oct 2019 16:56:47 +0100 Subject: [PATCH] smbdotconf: mark "abort shutdown script" with substitution="1" Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- docs-xml/smbdotconf/logon/abortshutdownscript.xml | 3 ++- source3/rpc_server/winreg/srv_winreg_nt.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 @@ This a full path name to a script called by smbd 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; -- 2.47.3