[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha8-200-g914fa62
Michael Adam
obnox at samba.org
Fri Jul 3 10:42:01 GMT 2009
The branch, master has been updated
via 914fa629f24c7ae7b99670c66427ee733bf53f8d (commit)
from dcf03b9d431bf5733bde76143da7405650ba119a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 914fa629f24c7ae7b99670c66427ee733bf53f8d
Author: Michael Adam <obnox at samba.org>
Date: Fri Jul 3 11:35:11 2009 +0200
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
-----------------------------------------------------------------------
Summary of changes:
source3/lib/pidfile.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 37b36af..2c52d12 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(), '/');
--
Samba Shared Repository
More information about the samba-cvs
mailing list