Merge branch 'maint-2.5' into maint-2.6

diff --git a/daemon.c b/daemon.c
index f9eb296888c37c8f2a523f3941be027ddb36df3c..77a2f03865ee84792d8c4316ceabcda1e075f1cd 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -802,6 +802,7 @@ static void check_dead_children(void)
                        /* remove the child */
                        *cradle = blanket->next;
                        live_children--;
+                       child_process_clear(&blanket->cld);
                        free(blanket);
                } else
                        cradle = &blanket->next;