From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 17 Jun 2020 09:24:15 +0000 (+0200)
Subject: socket: don't log errors on removing socket
X-Git-Tag: 4.0-pre3~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80316de3b8d57f184f9a0a48b09af3f6bd3df4c1;p=thirdparty%2Fchrony.git

socket: don't log errors on removing socket

Call unlink() directly to avoid an error log message when a Unix domain
socket cannot be removed (e.g. SOCK refclock created for gpsd in
/var/run).
---

diff --git a/socket.c b/socket.c
index 65befc7a..952b0d87 100644
--- a/socket.c
+++ b/socket.c
@@ -476,8 +476,8 @@ bind_unix_address(int sock_fd, const char *addr, int flags)
   }
   saddr.un.sun_family = AF_UNIX;
 
-  if (!UTI_RemoveFile(NULL, addr, NULL))
-    ;
+  if (unlink(addr) < 0)
+    DEBUG_LOG("Could not remove %s : %s", addr, strerror(errno));
 
   /* PRV_BindSocket() doesn't support Unix sockets yet */
   if (bind(sock_fd, &saddr.sa, sizeof (saddr.un)) < 0) {
@@ -1440,8 +1440,10 @@ SCK_RemoveSocket(int sock_fd)
       saddr.sa.sa_family != AF_UNIX)
     return 0;
 
-  if (!UTI_RemoveFile(NULL, saddr.un.sun_path, NULL))
+  if (unlink(saddr.un.sun_path) < 0) {
+    DEBUG_LOG("Could not remove %s : %s", saddr.un.sun_path, strerror(errno));
     return 0;
+  }
 
   return 1;
 }