From f6a39d75a776d38d492b9ab1b5405d022a8e1d2e Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 17 Jul 2013 13:45:36 +0200 Subject: [PATCH] Treat address bind errors as non-fatal --- cmdmon.c | 4 +++- ntp_io.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmdmon.c b/cmdmon.c index dd78afa..75bc464 100644 --- a/cmdmon.c +++ b/cmdmon.c @@ -248,8 +248,10 @@ prepare_socket(int family) } if (bind(sock_fd, &my_addr.u, my_addr_len) < 0) { - LOG_FATAL(LOGF_CmdMon, "Could not bind %s command socket : %s", + LOG(LOGS_ERR, LOGF_CmdMon, "Could not bind %s command socket : %s", family == AF_INET ? "IPv4" : "IPv6", strerror(errno)); + close(sock_fd); + return -1; } /* Register handler for read events on the socket */ diff --git a/ntp_io.c b/ntp_io.c index 9924056..0e7aa73 100644 --- a/ntp_io.c +++ b/ntp_io.c @@ -210,8 +210,10 @@ prepare_socket(int family) #endif if (bind(sock_fd, &my_addr.u, my_addr_len) < 0) { - LOG_FATAL(LOGF_NtpIO, "Could not bind %s NTP socket : %s", + LOG(LOGS_ERR, LOGF_NtpIO, "Could not bind %s NTP socket : %s", family == AF_INET ? "IPv4" : "IPv6", strerror(errno)); + close(sock_fd); + return -1; } /* Register handler for read events on the socket */