[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1184-g4735bf0

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  4735bf0e744e1015eeb5a9ef6e744011183d9e30 (commit)
       via  09411113d8f6b2389b3763bad24bcfdb61b0508c (commit)
      from  f0d67b6e119d719c2540eadce5849d3200dea2d0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 4735bf0e744e1015eeb5a9ef6e744011183d9e30
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Jul 3 13:08:06 2009 +0200

    WHATSNEW: Update changes.
    
    Karolin

commit 09411113d8f6b2389b3763bad24bcfdb61b0508c
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
    (cherry picked from commit 914a14b3a9c9d922d2a5c1aa413945afa11cfd2a)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt          |    2 ++
 source3/lib/pidfile.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 68c8b9e..9d45601 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -213,6 +213,7 @@ o    Jeremy Allison <jra at samba.org>
 o    Michael Adam <obnox at samba.org>
      * BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache().
      * BUG 6521: Fix building tevent_ntstatus without config.h.
+     * BUG 6531: Fix pid file name.
 
 
 o    Guenther Deschner <gd at samba.org>
@@ -225,6 +226,7 @@ o    Bjoern Jacke <bj at sernet.de>
 
 
 o    Volker Lendecke <vl at samba.org>
+     * BUG 6431: Local groups from 3.0 setups no longer found.
      * BUG 6498: Add workaround for MS KB932762.
 
 
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