X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=d8a8d83214304e079d78f4324bc6685e153e1186;hp=803c96c219d38621e5f449bb89d6e01cde232f91;hb=73d77dd416b87b7c4e9b6aa450f64846235cd2b4;hpb=23730375f27c32e0fe1a59c7a761dd85296a7a4a diff --git a/src/conf.c b/src/conf.c index 803c96c2..d8a8d832 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 + 2000-2009 Guus Sliepen 2000 Cris van Pelt This program is free software; you can redistribute it and/or modify @@ -417,7 +417,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 +469,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;