From 385df2910af4f4369b34fb2ccddbe64af6e2c0a5 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 3 Jul 2009 11:35:11 +0200 Subject: Revert "[s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we have it." This reverts commit 1d3dcd1e420104c23769b691d0b8b7958d5c58a7. This fixes Bug #6531 (Pid File creation.) Usually, I would extend is_default_dyn_XYZ() so that it returns true when dyn_XYZ has not been set yet or when its value is equal to the compiled in default value XZY. But this would have a change in effect in popt_common and torture.c: is_default_dyn_CONFIGFILE() is used there to check whether the config file should be overwritten by the contents of the environment variable SMB_CONF_PATH. Currently this is only done when set_dyn_CONFIGFILE() had _not_ previously been called at all, not even with the same value as the compiled in default. Michael (cherry picked from commit 914a14b3a9c9d922d2a5c1aa413945afa11cfd2a) Signed-off-by: Michael Adam (cherry picked from commit 09411113d8f6b2389b3763bad24bcfdb61b0508c) --- source3/lib/pidfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c index 37b36af2771..2c52d121220 100644 --- a/source3/lib/pidfile.c +++ b/source3/lib/pidfile.c @@ -94,7 +94,7 @@ void pidfile_create(const char *program_name) /* Add a suffix to the program name if this is a process with a * none default configuration file name. */ - if (is_default_dyn_CONFIGFILE()) { + if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) { name = SMB_STRDUP(program_name); } else { short_configfile = strrchr( get_dyn_CONFIGFILE(), '/'); -- cgit v1.2.1