Merge branch 'master' into 1.1

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 7794259..827da68 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -401,7 +401,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 */