From 28df53339389623166e71beaa628ec9e14c25ba8 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 26 Mar 2010 16:25:04 +0100 Subject: [PATCH] Accept messages with a "sufficient" payload if other payloads (such as V) follow --- src/libcharon/encoding/message.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c index 397a3c609f..acfc0fd447 100644 --- a/src/libcharon/encoding/message.c +++ b/src/libcharon/encoding/message.c @@ -1539,22 +1539,19 @@ static status_t verify(private_message_t *this) } } } + enumerator->destroy(enumerator); if (found_payloads < rule->min_occurence) { DBG1(DBG_ENC, "payload of type %N not occured %d times (%d)", payload_type_names, rule->payload_type, rule->min_occurence, found_payloads); - enumerator->destroy(enumerator); return VERIFY_ERROR; } - if (rule->sufficient && - this->payloads->get_count(this->payloads) == total_found_payloads) + if (rule->sufficient) { - enumerator->destroy(enumerator); return SUCCESS; } - enumerator->destroy(enumerator); } return SUCCESS; } -- 2.47.3