quick-mode: Fix reporting lifebytes if lifetime is configured
authorTobias Brunner <tobias@strongswan.org>
Wed, 15 Jun 2016 15:43:55 +0000 (17:43 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 17 Jun 2016 09:34:26 +0000 (11:34 +0200)
src/libcharon/sa/ikev1/tasks/quick_mode.c

index da41a3f..a6cc193 100644 (file)
@@ -146,7 +146,7 @@ struct private_quick_mode_t {
        uint32_t lifetime;
 
        /**
-        * Negotaited lifebytes of new SA
+        * Negotiated lifebytes of new SA
         */
        uint64_t lifebytes;
 
@@ -727,7 +727,7 @@ static void get_lifetimes(private_quick_mode_t *this)
        {
                this->lifetime = lft->time.life;
        }
-       else if (lft->bytes.life)
+       if (lft->bytes.life)
        {
                this->lifebytes = lft->bytes.life;
        }