Merge branch 'master' into 1.1

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index 6df001e351ec5e3de139d018eb577a648145a102..1a450413a11d7907310591a5db34dea0826e7a38 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -278,7 +278,7 @@ int reload_configuration(void) {
 
        read_config_options(config_tree, NULL);
 
-        xasprintf(&fname, "%s/hosts/%s", confbase, myself->name);
+        xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, myself->name);
         read_config_file(config_tree, fname);
        free(fname);    
 
@@ -303,7 +303,7 @@ int reload_configuration(void) {
                        c->outgoing = NULL;
                }
                
-               xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+               xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
                if(stat(fname, &s) || s.st_mtime > last_config_check)
                        terminate_connection(c, c->status.active);
                free(fname);