From 27c4b072b06881fca8bab8a5f07a9e7ce5de173f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 2 Nov 2006 09:37:52 +0000 Subject: r19533: Add a suffix to the program name if this is a process with a non-default configuration file name. Jeremy. (This used to be commit e8bf421c018ed829b9dba7c0872693080b77d49d) --- source3/lib/pidfile.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'source3/lib') diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c index 08e41083b5..49626acade 100644 --- a/source3/lib/pidfile.c +++ b/source3/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); -- cgit