From 4bdf0e80ee4cd0d40eb6522dab05df9346a5b3d0 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Wed, 16 Sep 2009 20:28:30 +0200
Subject: [PATCH] Replace asprintf()s not covered by the merge to xasprintf().

---
 src/net.c       |  2 +-
 src/net_setup.c |  2 +-
 src/tincctl.c   | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/net.c b/src/net.c
index 8ee78214..cb6ed499 100644
--- a/src/net.c
+++ b/src/net.c
@@ -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);
diff --git a/src/net_setup.c b/src/net_setup.c
index 623eb185..14520875 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -63,7 +63,7 @@ bool read_rsa_public_key(connection_t *c) {
 	/* Else, check for PublicKeyFile statement and read it */
 
 	if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
-		asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 
 	fp = fopen(fname, "r");
 
diff --git a/src/tincctl.c b/src/tincctl.c
index 92796b6b..0cc7d062 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -205,7 +205,7 @@ static bool keygen(int bits) {
 	} else
 		fprintf(stderr, _("Done.\n"));
 
-	asprintf(&filename, "%s/rsa_key.priv", confbase);
+	xasprintf(&filename, "%s/rsa_key.priv", confbase);
 	f = ask_and_open(filename, _("private RSA key"), "a");
 
 	if(!f)
@@ -225,9 +225,9 @@ static bool keygen(int bits) {
 	free(filename);
 
 	if(name)
-		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s/hosts/%s", confbase, name);
 	else
-		asprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s/rsa_key.pub", confbase);
 
 	f = ask_and_open(filename, _("public RSA key"), "a");
 
@@ -256,7 +256,7 @@ static void make_names(void) {
 #endif
 
 	if(netname)
-		asprintf(&identname, "tinc.%s", netname);
+		xasprintf(&identname, "tinc.%s", netname);
 	else
 		identname = xstrdup("tinc");
 
@@ -264,12 +264,12 @@ static void make_names(void) {
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
 			if(!logfilename)
-				asprintf(&logfilename, "%s/log/%s.log", identname);
+				xasprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
-					asprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s/%s", installdir, netname);
 				else
-					asprintf(&confbase, "%s", installdir);
+					xasprintf(&confbase, "%s", installdir);
 			}
 		}
 		RegCloseKey(key);
@@ -279,16 +279,16 @@ static void make_names(void) {
 #endif
 
 	if(!controlsocketname)
-		asprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
+		xasprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
 		else
 			fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
 	} else {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR "/tinc");
 	}
 }
 
-- 
2.20.1