NAT-T conditions were not inherited during IKE_SA rekeying

diff --git a/src/charon/sa/ike_sa.c b/src/charon/sa/ike_sa.c
index 9cada2cb505a80658c6fd28701c6a54a92659f27..93aa08965a7c2c3a5e9f2e1ab55b30128ddcf1b5 100644 (file)
--- a/src/charon/sa/ike_sa.c
+++ b/src/charon/sa/ike_sa.c
@@ -2090,7 +2090,14 @@ static status_t inherit(private_ike_sa_t *this, private_ike_sa_t *other)
        {
                this->dns_servers->insert_first(this->dns_servers, ip);
        }
-       
+
+       /* inherit NAT-T conditions */
+       this->conditions = other->conditions;
+       if (this->conditions & COND_NAT_HERE)
+       {
+               send_keepalive(this);
+       }
+
        /* adopt all children */
        while (other->child_sas->remove_last(other->child_sas,
                                                                                 (void**)&child_sa) == SUCCESS)