From: Martin Willi <martin@revosec.ch>
Date: Wed, 18 Sep 2013 11:59:44 +0000 (+0200)
Subject: ikev1: Don't log a reauthentication detection message if no children adopted
X-Git-Tag: 5.1.1dr4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c19d7ca31f2a801935580f4b737f1ed3720f469;p=thirdparty%2Fstrongswan.git

ikev1: Don't log a reauthentication detection message if no children adopted

When a replace unique policy is in place, the children get adopted during
the uniqueness check. In this case the message is just misleading.
---

diff --git a/src/libcharon/processing/jobs/adopt_children_job.c b/src/libcharon/processing/jobs/adopt_children_job.c
index df5b70c0f3..f99c0b9327 100644
--- a/src/libcharon/processing/jobs/adopt_children_job.c
+++ b/src/libcharon/processing/jobs/adopt_children_job.c
@@ -102,8 +102,12 @@ METHOD(job_t, execute, job_requeue_t,
 						children->insert_last(children, child_sa);
 					}
 					childenum->destroy(childenum);
-					DBG1(DBG_IKE, "detected reauth of existing IKE_SA, "
-						 "adopting %d children", children->get_count(children));
+					if (children->get_count(children))
+					{
+						DBG1(DBG_IKE, "detected reauth of existing IKE_SA, "
+							 "adopting %d children",
+							 children->get_count(children));
+					}
 					ike_sa->set_state(ike_sa, IKE_DELETING);
 					charon->bus->ike_updown(charon->bus, ike_sa, FALSE);
 					charon->ike_sa_manager->checkin_and_destroy(