Attachment 4397 Details for Bug 6531 – patch with a fix for 3.4

[patch] patch with a fix for 3.4

0001-Revert-s3-pidfile_create-use-check-is_default_dyn.patch (text/plain), 1.61 KB, created by Michael Adam on 2009-07-03 05:46:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2009-07-03 05:46:25 UTC

Size: 1.61 KB

patch

obsolete

>From 0b29fc3cda122ff056a450f5d47de9cba7018e46 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Fri, 3 Jul 2009 11:35:11 +0200
>Subject: [PATCH] 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 <obnox@samba.org>
>---
> source3/lib/pidfile.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>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(), '/');
>-- 
>1.6.0.4
>

Actions: View

Attachments on bug 6531: 4397