kernel-pfkey: Prefer policies with reqid over those without

src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c

@@ -2598,7 +2598,13 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
 	enumerator = policy->used_by->create_enumerator(policy->used_by);
 	while (enumerator->enumerate(enumerator, (void**)&current_sa))
 	{
-		if (current_sa->priority >= assigned_sa->priority)
+		if (current_sa->priority > assigned_sa->priority)
+		{
+			break;
+		}
+		/* prefer SAs with a reqid over those without */
+		if (current_sa->priority == assigned_sa->priority &&
+			(!current_sa->sa->cfg.reqid || assigned_sa->sa->cfg.reqid))
 		{
 			break;
 		}