[Bug 2890] Ignore ENOBUFS on routing netlink socket. Konstantin Khlebnikov.

bk: 55bb2a932NvHWXSyg6L4u2_EFP_eJw

diff --git a/ChangeLog b/ChangeLog
index 34e062abae313afd91a13a5585dad85281af341b..d64e505a44859504afefd83d4839fa30a7dd3add 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@
   be configured for the distribution targets.  Harlan Stenn.
 * [Bug 2883] ntpd crashes on exit with empty driftfile.  Miroslav Lichvar.
 * [Bug 2886] Mis-spelling: "outlyer" should be "outlier".  dave@horsfall.org
+* [Bug 2890] Ignore ENOBUFS on routing netlink socket.  Konstantin Khlebnikov.
 * libntp/emalloc.c: Remove explicit include of stdint.h.  Harlan Stenn.
 * Put Unity CPPFLAGS items in unity_config.h.  Harlan Stenn.
 * tests/ntpd/g_leapsec.cpp typo fix.  Harlan Stenn.

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 136e9e9d44330531fd539a5a2ffc5141bbb18078..114e9bbca6043313c148ac0149e5349c222d882e 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -4622,10 +4622,15 @@ process_routing_msgs(struct asyncio_reader *reader)
        cnt = read(reader->fd, buffer, sizeof(buffer));
 
        if (cnt < 0) {
-               msyslog(LOG_ERR,
-                       "i/o error on routing socket %m - disabling");
-               remove_asyncio_reader(reader);
-               delete_asyncio_reader(reader);
+               if (errno == ENOBUFS) {
+                       msyslog(LOG_ERR,
+                               "routing socket reports: %m");
+               } else {
+                       msyslog(LOG_ERR,
+                               "routing socket reports: %m - disabling");
+                       remove_asyncio_reader(reader);
+                       delete_asyncio_reader(reader);
+               }
                return;
        }