Ensure directory name always ends with "/"
authorAlan T. DeKok <aland@freeradius.org>
Fri, 1 Mar 2013 16:08:50 +0000 (11:08 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Fri, 1 Mar 2013 16:08:50 +0000 (11:08 -0500)
src/main/conffile.c

index e1fb613..505dd4a 100644 (file)
@@ -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;