r19581: Merge from SAMBA_3_0_23

1 files changed, 12 insertions, 1 deletions

diff --git a/source/lib/pidfile.c b/source/lib/pidfile.c
index 08e41083b59..49626acade5 100644
--- a/source/lib/pidfile.c
+++ b/source/lib/pidfile.c
@@ -78,13 +78,24 @@ pid_t pidfile_pid(const char *name)
 }
 
 /* create a pid file in the pid directory. open it and leave it locked */
-void pidfile_create(const char *name)
+void pidfile_create(const char *program_name)
 {
 	int     fd;
 	char    buf[20];
+	char    *short_configfile;
+	pstring name;
 	pstring pidFile;
 	pid_t pid;
 
+	/* Add a suffix to the program name if this is a process with a
+	 * none default configuration file name. */
+	if (strcmp( CONFIGFILE, dyn_CONFIGFILE) == 0) {
+		strncpy( name, program_name, sizeof( name)-1);
+	} else {
+		short_configfile = strrchr( dyn_CONFIGFILE, '/');
+		slprintf( name, sizeof( name)-1, "%s-%s", program_name, short_configfile+1);
+	}
+
 	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
 
 	pid = pidfile_pid(name);