X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=11ce65f04782fa65dfcf0ad9465f62950f17c269;hb=0806605ce383b7e89fa26eda56f8a5f3bbed9dd3;hp=1a791a717316ba82503997c4b0dca8c635ae2ffe;hpb=a07602c4fddfca9894f1d738959ae359695f5bf9;p=tinc diff --git a/src/protocol.c b/src/protocol.c index 1a791a71..11ce65f0 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: protocol.c,v 1.28.4.64 2000/11/22 19:55:50 guus Exp $ + $Id: protocol.c,v 1.28.4.66 2000/11/22 22:05:37 guus Exp $ */ #include "config.h" @@ -846,7 +846,7 @@ cp /* Check if somebody tries to add ourself */ - if(!strcmp(new->name, myself->name)) + if(!strcmp(name, myself->name)) { syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname); sighup = 1; @@ -1258,8 +1258,8 @@ cp from->cipher_pktkey = xstrdup(pktkey); keylength /= 2; - hex2bin(pktkey, pktkey, keylength); - pktkey[keylength] = '\0'; + hex2bin(from->cipher_pktkey, from->cipher_pktkey, keylength); + from->cipher_pktkey[keylength] = '\0'; from->status.validkey = 1; from->status.waitingforkey = 0;