X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=11fbcb1ce4ff5b0414be47d35f8e0206e9b2b4f8;hb=e9de08be0dab58a48f9a8ce3d250516cf05d6b8e;hp=16368080ce61940ca28cc50d80b912d09a647839;hpb=4c8ead98743254be97c830e942f0cc53539d780c;p=tinc

diff --git a/src/net.c b/src/net.c
index 16368080..11fbcb1c 100644
--- 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);
@@ -344,7 +344,7 @@ int reload_configuration(void) {
 
 		for(node = myself->subnet_tree->head; node; node = node->next) {
 			subnet_t *subnet = node->data;
-			logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d\n", subnet, subnet->expires);
+			logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d", subnet, (int)subnet->expires);
 			if(!subnet->expires)
 				subnet->expires = 1;
 		}
@@ -356,7 +356,7 @@ int reload_configuration(void) {
 				continue;
 
 			if((s2 = lookup_subnet(myself, subnet))) {
-				logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d\n", s2, s2->expires);
+				logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d", s2, (int)s2->expires);
 				if(s2->expires == 1)
 					s2->expires = 0;