From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 18 Oct 2018 15:19:47 +0000 (+0200)
Subject: Allow "tinc --force join" to accept all variables sent in an invitaiton.
X-Git-Tag: release-1.1pre18~43
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=061362d2fd0fb295d943c7a69cce9e050041386d;p=tinc

Allow "tinc --force join" to accept all variables sent in an invitaiton.
---

diff --git a/src/invitation.c b/src/invitation.c
index 411af2bf..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