From b86758ebcc9d017594bf16041d4e83b6d8b27ff3 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 6 Apr 2007 22:08:44 +0000 Subject: r22113: Fix core dump when configfile in same directory. From Steven Danneman . Jeremy. (This used to be commit 572c418b04eb1dbce8da7643fe7e236b06fce57b) --- source3/lib/pidfile.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/lib') diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c index 49626acade..89ab6d799b 100644 --- a/source3/lib/pidfile.c +++ b/source3/lib/pidfile.c @@ -93,6 +93,13 @@ void pidfile_create(const char *program_name) strncpy( name, program_name, sizeof( name)-1); } else { short_configfile = strrchr( dyn_CONFIGFILE, '/'); + if (short_configfile == NULL) { + /* conf file in current directory */ + short_configfile = dyn_CONFIGFILE; + } else { + /* full/relative path provided */ + short_configfile++; + } slprintf( name, sizeof( name)-1, "%s-%s", program_name, short_configfile+1); } -- cgit