From: Heiko Schlittermann (HS12-RIPE) Date: Tue, 16 Mar 2021 22:44:29 +0000 (+0100) Subject: tidy X-Git-Tag: exim-4.95-RC0~51^2~56 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/0d0fd7f64d12b5b90be76d3bc17e144b55ee20bd tidy (cherry picked from commit 7973b58af7db0fb8fddb54b366dcf43c7ce131ec) (cherry picked from commit b7e726f6ae4c6f19e7efc4e6b10ec35e5b01368c) --- diff --git a/src/src/daemon.c b/src/src/daemon.c index 52e6dcab1..c9e6f334f 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -1058,7 +1058,7 @@ len = offsetof(struct sockaddr_un, sun_path) + 1 DEBUG(D_any) debug_printf(" @%s\n", sa_un.sun_path+1); #else /* filesystem-visible and persistent; will neeed removal */ len = offsetof(struct sockaddr_un, sun_path) - + snprintf(sa_un.sun_path, sizeof(sa_un.sun_path), "%s", + + snprintf(sa_un.sun_path, sizeof(sa_un.sun_path), "%s", expand_string(notifier_socket)); DEBUG(D_any) debug_printf(" %s\n", sa_un.sun_path); #endif @@ -2415,7 +2415,7 @@ for (;;) accept_retry_errno = errno; accept_retry_select_failed = select_failed; } - else if ( errno != accept_retry_errno + else if ( errno != accept_retry_errno || select_failed != accept_retry_select_failed || accept_retry_count >= 50) {