X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=5058d3154f7b4f1db1040f33eac9aa163771a181;hp=ce776804909d2b1afec88dfe26a45954f0ee7baa;hb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;hpb=78fc59e994c764d072bf0045177f690a378d1308

diff --git a/src/conf.c b/src/conf.c
index ce776804..5058d315 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -15,11 +15,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    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$
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #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;