From 061362d2fd0fb295d943c7a69cce9e050041386d Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 18 Oct 2018 17:19:47 +0200 Subject: [PATCH] Allow "tinc --force join" to accept all variables sent in an invitaiton. --- src/invitation.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 -- 2.20.1