From da1783ea2903917f60de8753f7a3457eabd7280e Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Fri, 28 Jan 2011 21:52:37 +0000 Subject: [PATCH] Close all unneeded descriptors after fork(2). MFC after: 1 week --- sbin/hastd/primary.c | 17 +++++++++++------ sbin/hastd/secondary.c | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 7929c1fc06f3..94fbe34efebb 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -790,7 +790,7 @@ hastd_primary(struct hast_resource *res) { pthread_t td; pid_t pid; - int error; + int error, mode; /* * Create communication channel between parent and child. @@ -822,19 +822,24 @@ hastd_primary(struct hast_resource *res) /* This is parent. */ /* Declare that we are receiver. */ proto_recv(res->hr_event, NULL, 0); + /* Declare that we are sender. */ + proto_send(res->hr_ctrl, NULL, 0); res->hr_workerpid = pid; return; } gres = res; - - (void)pidfile_close(pfh); - hook_fini(); - - setproctitle("%s (primary)", res->hr_name); + mode = pjdlog_mode_get(); /* Declare that we are sender. */ proto_send(res->hr_event, NULL, 0); + /* Declare that we are receiver. */ + proto_recv(res->hr_ctrl, NULL, 0); + descriptors_cleanup(res); + + pjdlog_init(mode); + pjdlog_prefix_set("[%s] (%s) ", res->hr_name, role2str(res->hr_role)); + setproctitle("%s (primary)", res->hr_name); init_local(res); init_ggate(res); diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index a722726f5e6c..ae1179239e80 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -347,7 +347,7 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin) sigset_t mask; pthread_t td; pid_t pid; - int error; + int error, mode; /* * Create communication channel between parent and child. @@ -380,23 +380,28 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin) res->hr_remoteout = NULL; /* Declare that we are receiver. */ proto_recv(res->hr_event, NULL, 0); + /* Declare that we are sender. */ + proto_send(res->hr_ctrl, NULL, 0); res->hr_workerpid = pid; return; } gres = res; + mode = pjdlog_mode_get(); - (void)pidfile_close(pfh); - hook_fini(); + /* Declare that we are sender. */ + proto_send(res->hr_event, NULL, 0); + /* Declare that we are receiver. */ + proto_recv(res->hr_ctrl, NULL, 0); + descriptors_cleanup(res); + pjdlog_init(mode); + pjdlog_prefix_set("[%s] (%s) ", res->hr_name, role2str(res->hr_role)); setproctitle("%s (secondary)", res->hr_name); PJDLOG_VERIFY(sigemptyset(&mask) == 0); PJDLOG_VERIFY(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); - /* Declare that we are sender. */ - proto_send(res->hr_event, NULL, 0); - /* Error in setting timeout is not critical, but why should it fail? */ if (proto_timeout(res->hr_remotein, 0) < 0) pjdlog_errno(LOG_WARNING, "Unable to set connection timeout");