summaryrefslogtreecommitdiff
path: root/src/libcharon/processing
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2013-11-01 13:32:07 +0100
committerYves-Alexis Perez <corsac@debian.org>2013-11-01 13:32:07 +0100
commita54780509260a8cb6f0344f531da168b34410dd5 (patch)
tree477239a312679174252f39f7a80bc8bf33836d9a /src/libcharon/processing
parent6e50941f7ce9c6f2d6888412968c7f4ffb495379 (diff)
parent5313d2d78ca150515f7f5eb39801c100690b6b29 (diff)
downloadvyos-strongswan-a54780509260a8cb6f0344f531da168b34410dd5.tar.gz
vyos-strongswan-a54780509260a8cb6f0344f531da168b34410dd5.zip
Merge tag 'upstream/5.1.1'
Upstream version 5.1.1
Diffstat (limited to 'src/libcharon/processing')
-rw-r--r--src/libcharon/processing/jobs/adopt_children_job.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libcharon/processing/jobs/adopt_children_job.c b/src/libcharon/processing/jobs/adopt_children_job.c
index df5b70c0f..f99c0b932 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(