From: Guus Sliepen Date: Tue, 19 Jul 2011 19:11:11 +0000 (+0200) Subject: Fix tinc 1.0.x daemons connecting when ExperimentalProtocol = yes. X-Git-Tag: release-1.1pre3~170 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2f4ccfe2473948372f7c9f14d9ffce1d77f5fd8c;p=oweals%2Ftinc.git Fix tinc 1.0.x daemons connecting when ExperimentalProtocol = yes. --- diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 4331e94..4eb61bd 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -110,6 +110,9 @@ bool id_h(connection_t *c, char *request) { return send_ack(c); } + if(!experimental) + c->protocol_minor = 0; + if(!c->config_tree) { init_configuration(&c->config_tree); @@ -123,13 +126,10 @@ bool id_h(connection_t *c, char *request) { if(!read_ecdsa_public_key(c)) return false; } else { - if(!ecdsa_active(&c->ecdsa)) + if(c->protocol_minor && !ecdsa_active(&c->ecdsa)) c->protocol_minor = 1; } - if(!experimental) - c->protocol_minor = 0; - c->allow_request = METAKEY; if(c->protocol_minor >= 2)