faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

socket: don't log errors on removing socket

Browse source 
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).
This commit is contained in:
Miroslav Lichvar 2020-06-17 11:24:15 +02:00
parent f9e2a5852d
commit 80316de3b8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
socket.c
View file

@ -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;
}