From e242a611e755ef553aa2feeac4e3cbd162a4aad3 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 16 Apr 2013 21:42:24 +0200 Subject: [PATCH] Sockets: make clear we don't close a socket again. --- citadel/sysdep.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 6bdbac3e7..193458d56 100644 --- a/citadel/sysdep.c +++ b/citadel/sysdep.c @@ -917,18 +917,39 @@ void close_masters (void) if (serviceptr->tcp_port > 0) { - syslog(LOG_INFO, "Closing %d listener on port %d\n", + const char *Text; + + if (serviceptr->msock == -1) + Text = "not closing again"; + else + Text = "Closing"; + + syslog(LOG_INFO, "%s %d listener on port %d\n", + Text, serviceptr->msock, serviceptr->tcp_port); serviceptr->tcp_port = 0; } if (serviceptr->sockpath != NULL) - syslog(LOG_INFO, "Closing %d listener on '%s'\n", + { + if (serviceptr->msock == -1) + Text = "not closing again"; + else + Text = "Closing"; + + syslog(LOG_INFO, "%s %d listener on '%s'\n", + Text, serviceptr->msock, serviceptr->sockpath); + } + if (serviceptr->msock != -1) + { close(serviceptr->msock); + serviceptr->msock = -1; + } + /* If it's a Unix domain socket, remove the file. */ if (serviceptr->sockpath != NULL) { unlink(serviceptr->sockpath); -- 2.30.2