From: Jeremy Allison <jra@samba.org>
Date: Fri, 6 Apr 2007 22:08:44 +0000 (+0000)
Subject: r22113: Fix core dump when configfile in same directory.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~755
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=572c418b04eb1dbce8da7643fe7e236b06fce57b;p=thirdparty%2Fsamba.git

r22113: Fix core dump when configfile in same directory.
From Steven Danneman <steven.danneman@isilon.com>.
Jeremy.
---

diff --git a/source/lib/pidfile.c b/source/lib/pidfile.c
index 49626acade5..89ab6d799b7 100644
--- a/source/lib/pidfile.c
+++ b/source/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);
 	}