X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=35f236ed8dbb00cad9c0e9ca3b7494199667d1d5;hb=061362d2fd0fb295d943c7a69cce9e050041386d;hp=500f2434b77e150a0d2f566e2fa89e6693d13380;hpb=1c475ecb575367a6b3f9328b0f643ad636155341;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index 500f2434..35f236ed 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -836,8 +836,12 @@ make_names:
 			fprintf(stderr, "Ignoring unknown variable '%s' in invitation.\n", l);
 			continue;
 		} else if(!(variables[i].type & VAR_SAFE)) {
-			fprintf(stderr, "Ignoring unsafe variable '%s' in invitation.\n", l);
-			continue;
+			if(force) {
+				fprintf(stderr, "Warning: unsafe variable '%s' in invitation.\n", l);
+			} else {
+				fprintf(stderr, "Ignoring unsafe variable '%s' in invitation.\n", l);
+				continue;
+			}
 		}
 
 		// Copy the safe variable to the right config file
@@ -1013,10 +1017,14 @@ ask_netname:
 					char *command;
 #ifndef HAVE_MINGW
 					const char *editor = getenv("VISUAL");
-					if (!editor)
+
+					if(!editor) {
 						editor = getenv("EDITOR");
-					if (!editor)
+					}
+
+					if(!editor) {
 						editor = "vi";
+					}
 
 					xasprintf(&command, "\"%s\" \"%s\"", editor, filename);
 #else