X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=cb6ed4996638b35899a5f51b0cff48a4f9d17c51;hb=4bdf0e80ee4cd0d40eb6522dab05df9346a5b3d0;hp=b811754aacf221d5de67614bdded2f510509716d;hpb=d82fcc88f355e3c8144478a860dfae0b299004a9;p=tinc

diff --git a/src/net.c b/src/net.c
index b811754a..cb6ed499 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -203,7 +203,7 @@ static void timeout_handler(int fd, short events, void *event) {
 void handle_meta_connection_data(int fd, short events, void *data) {
 	connection_t *c = data;
 	int result;
-	socklen_t len = sizeof(result);
+	socklen_t len = sizeof result;
 
 	if(c->status.connecting) {
 		c->status.connecting = false;
@@ -270,7 +270,7 @@ int reload_configuration(void) {
 			c->outgoing = NULL;
 		}
 		
-		asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 		if(stat(fname, &s) || s.st_mtime > last_config_check)
 			terminate_connection(c, c->status.active);
 		free(fname);