From 8129cc848a3c12805546484d7f28acf221d0a35e Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Tue, 25 Sep 2007 20:07:04 +0000 Subject: [PATCH] fixed bug occuring with multiple queued Quick Modes and NAT Traversal --- src/pluto/connections.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pluto/connections.c b/src/pluto/connections.c index 6a907263e..40bdcd82b 100644 --- a/src/pluto/connections.c +++ b/src/pluto/connections.c @@ -3028,11 +3028,10 @@ ISAKMP_SA_established(struct connection *c, so_serial_t serial) { struct connection *next = d->ac_next; /* might move underneath us */ - if (d->kind >= CK_PERMANENT + if (d->kind >= CK_PERMANENT && same_id(&c->spd.this.id, &d->spd.this.id) && same_id(&c->spd.that.id, &d->spd.that.id) - && (!sameaddr(&c->spd.that.host_addr, &d->spd.that.host_addr) || - (c->spd.that.host_port != d->spd.that.host_port))) + && !sameaddr(&c->spd.that.host_addr, &d->spd.that.host_addr)) { release_connection(d, FALSE); }