From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 28 Apr 2013 17:33:04 +0000 (+0200)
Subject: Don't try to create tinc.conf when using set or add commands.
X-Git-Tag: release-1.1pre8~61
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=43c72093ade72f14cb2fc78bef55dade8cd38df7;p=tinc

Don't try to create tinc.conf when using set or add commands.

It is almost certainly an error. If one really wants to create a new tinc.conf
file, one should use the init command.
---

diff --git a/src/tincctl.c b/src/tincctl.c
index e022cdd5..bc640314 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1437,19 +1437,8 @@ static int cmd_config(int argc, char *argv[]) {
 
 	FILE *f = fopen(filename, "r");
 	if(!f) {
-		if(action < 0 || errno != ENOENT) {
-			fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
-			return 1;
-		}
-
-		// If it doesn't exist, create it.
-		f = fopen(filename, "a+");
-		if(!f) {
-			fprintf(stderr, "Could not create configuration file %s: %s\n", filename, strerror(errno));
-			return 1;
-		} else {
-			fprintf(stderr, "Created configuration file %s.\n", filename);
-		}
+		fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
 	}
 
 	char *tmpfile = NULL;