Fix tinc 1.0.x daemons connecting when ExperimentalProtocol = yes.

This commit is contained in:
Guus Sliepen 2011-07-19 21:11:11 +02:00
parent f8d94f34fc
commit 2f4ccfe247

View file

@ -110,6 +110,9 @@ bool id_h(connection_t *c, char *request) {
return send_ack(c); return send_ack(c);
} }
if(!experimental)
c->protocol_minor = 0;
if(!c->config_tree) { if(!c->config_tree) {
init_configuration(&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)) if(!read_ecdsa_public_key(c))
return false; return false;
} else { } else {
if(!ecdsa_active(&c->ecdsa)) if(c->protocol_minor && !ecdsa_active(&c->ecdsa))
c->protocol_minor = 1; c->protocol_minor = 1;
} }
if(!experimental)
c->protocol_minor = 0;
c->allow_request = METAKEY; c->allow_request = METAKEY;
if(c->protocol_minor >= 2) if(c->protocol_minor >= 2)