From ea61dd917e671f2eee225e55aaed285a43ec7523 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 5 Nov 2019 11:04:39 +0100 Subject: [PATCH] smbdotconf: mark "panic action" with substitution="1" Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- docs-xml/smbdotconf/misc/panicaction.xml | 1 + source3/lib/util.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs-xml/smbdotconf/misc/panicaction.xml b/docs-xml/smbdotconf/misc/panicaction.xml index 7b7df256388..01a97c3dba4 100644 --- a/docs-xml/smbdotconf/misc/panicaction.xml +++ b/docs-xml/smbdotconf/misc/panicaction.xml @@ -1,6 +1,7 @@ This is a Samba developer option that allows a diff --git a/source3/lib/util.c b/source3/lib/util.c index ce89c0659af..9c8717172a6 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -821,6 +821,8 @@ gid_t nametogid(const char *name) void smb_panic_s3(const char *why) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); char *cmd; int result; @@ -835,7 +837,7 @@ void smb_panic_s3(const char *why) prctl(PR_SET_PTRACER, getpid(), 0, 0, 0); #endif - cmd = lp_panic_action(talloc_tos()); + cmd = lp_panic_action(talloc_tos(), lp_sub); if (cmd && *cmd) { DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmd)); result = system(cmd); -- 2.47.3