- modified function get_pathname to return path relative to the

  path of the main SER configuration file if it does not start
  with /, this is much more sensible then just pre-pending CFG_DIR,
  it is possible to write modparam("tls", "config", "tls.cfg")
  and still control the location of the configuration files using
  -f cmd line option
- the function now returns result allocated with malloc, not
  pkg_malloc

modules/tls/tls_config.c

@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include <libgen.h>
+#include <malloc.h>
 #include "../../mem/mem.h"
 #include "../../dprint.h"
 #include "../../trim.h"
@@ -683,10 +684,10 @@ static char* parse_file_val(token_t* token)
 	file = get_pathname(&val);
 	if (!file) return 0;
 	if (shm_asciiz_dup(&res, file) < 0) {
-		pkg_free(file);
+		free(file);
 		return 0;
 	}
-	pkg_free(file);
+	free(file);
 	return res;
 }
 
@@ -1000,7 +1001,7 @@ tls_cfg_t* tls_load_config(str* filename)
 	pstate.f = fopen(file, "r");
 	if (pstate.f == NULL) {
 		ERR("Unable to open TLS config file '%s'\n", file);
-		pkg_free(file);
+		free(file);
 		return 0;
 	}
 	pstate.file = basename(file);
@@ -1014,11 +1015,11 @@ tls_cfg_t* tls_load_config(str* filename)
 	if (parse_config() < 0) goto error;
 
 	fclose(pstate.f);
-	pkg_free(file);
+	free(file);
 	return pstate.cfg;
 
  error:
-	pkg_free(file);
+	free(file);
 	if (pstate.cfg) tls_free_cfg(pstate.cfg);
 	fclose(pstate.f);
 	return 0;

modules/tls/tls_util.c

@@ -29,8 +29,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define _GNU_SOURCE 1 /* Needed for strndup */
+
 #include <string.h>
+#include <libgen.h>
+#include <malloc.h>
 #include "../../mem/shm_mem.h"
+#include "../../globals.h"
 #include "tls_mod.h"
 #include "tls_util.h"
 
@@ -114,37 +119,52 @@ void collect_garbage(void)
 	lock_release(tls_cfg_lock);
 }
 
-
-/*
- * Get full path name of file, if the parameter does
- * not start with / then the value of CFG_DIR will
- * be used as prefix
- * The string returned by the function must be
- * freed using pkg_free
+/** Get full pathname of file. This function returns the full pathname of a
+ * file in parameter. If the parameter does not start with / then the pathname
+ * of the file will be relative to the pathname of the main SER configuration
+ * file.
+ * @param filename A pathname to be converted to absolute.
+ * @return A string containing absolute pathname, the string
+ *         must be freed with free.
  */
-char* get_pathname(str* filename)
+char* get_pathname(str* file)
 {
-	char* res;
+	char* buf, *dir, *res;
 	int len;
 
-	if (filename->s[0] == '/') {
-		res = pkg_malloc(filename->len + 1);
-		if (!res) {
-			ERR("No memory left\n");
-			return 0;
+	if (!file || !file->s || file->len <= 0 || !cfg_file) {
+		BUG("tls: Cannot get full pathname of file\n");
+		return NULL;
+	}
+
+	if (file->s[0] == '/') {
+		/* This is an absolute pathname, make a zero terminated
+		 * copy and use it as it is */
+		if ((res = strndup(file->s, file->len)) == NULL) {
+			ERR("tls: No memory left (strndup failed)\n");
 		}
-		memcpy(res, filename->s, filename->len);
-		res[filename->len] = '\0';
 	} else {
-		len = strlen(CFG_DIR) + filename->len;
-		res = pkg_malloc(len + 1);
-		if (!res) {
-			ERR("No memory left\n");
-			return 0;
+		/* This is not an absolute pathname, make it relative
+		 * to the location of the main SER configuration file
+		 */
+		/* Make a copy, function dirname may modify the string */
+		if ((buf = strdup(cfg_file)) == NULL) {
+			ERR("tls: No memory left (strdup failed)\n");
+			return NULL;
+		}
+		dir = dirname(buf);
+
+		len = strlen(dir);
+		if ((res = malloc(len + 1 + file->len + 1)) == NULL) {
+			ERR("tls: No memory left (malloc failed)\n");
+			free(buf);
+			return NULL;
 		}
-		memcpy(res, CFG_DIR, sizeof(CFG_DIR) - 1);
-		memcpy(res + sizeof(CFG_DIR) - 1, filename->s, filename->len);
-		res[sizeof(CFG_DIR) - 1 + filename->len] = '\0';
+		memcpy(res, dir, len);
+		res[len] = '/';
+		memcpy(res + len + 1, file->s, file->len);
+		res[len + 1 + file->len] = '\0';
+		free(buf);
 	}
 	return res;
 }

modules/tls/tls_util.h

@@ -82,12 +82,13 @@ int shm_asciiz_dup(char** dest, char* val);
 void collect_garbage(void);
 
 
-/*
- * Get full path name of file, if the parameter does
- * not start with / then the value of CFG_DIR will
- * be used as prefix
- * The string returned by the function must be
- * freed using pkg_free
+/** Get full pathname of file. This function returns the full pathname of a
+ * file in parameter. If the parameter does not start with / then the pathname
+ * of the file will be relative to the pathname of the main SER configuration
+ * file.
+ * @param filename A pathname to be converted to absolute.
+ * @return A string containing absolute pathname, the string
+ *         must be freed with free.
  */
 char* get_pathname(str* filename);