X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=8af2c6a230c8969936415bdf11c5bfa445e66ddb;hp=803c96c219d38621e5f449bb89d6e01cde232f91;hb=c217d214f4f071c235bc7c463a1da6124e2570a6;hpb=23730375f27c32e0fe1a59c7a761dd85296a7a4a

diff --git a/src/conf.c b/src/conf.c
index 803c96c2..8af2c6a2 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,7 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2008 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 		  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
@@ -18,8 +18,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #include "system.h"
@@ -417,7 +415,7 @@ bool read_server_config()
 
 	cp();
 
-	asprintf(&fname, "%s/tinc.conf", confbase);
+	xasprintf(&fname, "%s/tinc.conf", confbase);
 	x = read_config_file(config_tree, fname);
 
 	if(x == -1) {				/* System error: complain */
@@ -469,7 +467,7 @@ FILE *ask_and_open(const char *filename, const char *what)
 		char *p;
 
 		directory = get_current_dir_name();
-		asprintf(&p, "%s/%s", directory, fn);
+		xasprintf(&p, "%s/%s", directory, fn);
 		free(fn);
 		free(directory);
 		fn = p;