Fix "set nexthop to him when instantiating rightallowyes template with leftnexthop...

This fixes commit 280f6b1ab2.

diff --git a/src/pluto/connections.c b/src/pluto/connections.c
index 9f277e135ffb445800984f93d5aaf792b456503b..e1b471b238b95a0f43cfae0da924f0951c4c1452 100644 (file)
--- a/src/pluto/connections.c
+++ b/src/pluto/connections.c
@@ -1443,11 +1443,11 @@ static connection_t *instantiate(connection_t *c, const ip_address *him,
 
        connect_to_host_pair(d);
 
-       return d;
        if (sameaddr(&d->spd.that.host_addr, &d->spd.this.host_nexthop))
        {
                d->spd.this.host_nexthop = *him;
        }
+       return d;
 }
 
 connection_t *rw_instantiate(connection_t *c, const ip_address *him,