From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 1 Mar 2013 16:08:50 +0000 (-0500)
Subject: Ensure directory name always ends with "/"
X-Git-Tag: release_3_0_0_beta1~888
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e60c3c5f693e82c25570c0622a9772b727c5083;p=thirdparty%2Ffreeradius-server.git

Ensure directory name always ends with "/"
---

diff --git a/src/main/conffile.c b/src/main/conffile.c
index e1fb613cf07..505dd4a4595 100644
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -1202,6 +1202,11 @@ static const char *cf_local_file(const char *base, const char *filename,
 
 	p = strrchr(base, FR_DIR_SEP);
 	if (!p) return filename;
+	if (p[1]) {		/* ./foo */
+		strlcat(base, "/", sizeof(base));
+		p = strrchr(base, '/');
+		rad_assert(p != NULL);
+	}
 
 	dirsize = (p - base) + 1;