auth-cfg: Prefer merged rules over existing ones when moving them

This is particularly important for single valued rules (e.g.
identities).  When copying values this is already handled correctly
by the enumerator and add().

diff --git a/src/libstrongswan/credentials/auth_cfg.c b/src/libstrongswan/credentials/auth_cfg.c
index 1e93f021ab5b875a570232d0a4c90c4e23e180f9..9988d8021f5bc741d7800c1aa7541ea38dda01a1 100644 (file)
--- a/src/libstrongswan/credentials/auth_cfg.c
+++ b/src/libstrongswan/credentials/auth_cfg.c
@@ -951,9 +951,9 @@ static void merge(private_auth_cfg_t *this, private_auth_cfg_t *other, bool copy
        {
                entry_t entry;
 
-               while (array_remove(other->entries, ARRAY_HEAD, &entry))
-               {
-                       array_insert(this->entries, ARRAY_TAIL, &entry);
+               while (array_remove(other->entries, ARRAY_TAIL, &entry))
+               {       /* keep order but prefer new values (esp. for single valued ones) */
+                       array_insert(this->entries, ARRAY_HEAD, &entry);
                }
                array_compress(other->entries);
        }