usepeerdns stuff from Nick Walker

[ppp.git] / pppd / sys-linux.c

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 280ce890b1db45d2a422db65f0f77f067b61c15f..af5164fe3e4be1cef3aab5b30a85d8561cdb4af6 100644 (file)
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -808,14 +808,13 @@ void output (int unit, unsigned char *p, int len)
     if (write(ppp_fd, p, len) < 0)
       {
        if (errno == EWOULDBLOCK || errno == ENOBUFS
-           || errno == ENXIO || errno == EIO)
+           || errno == ENXIO || errno == EIO || errno == EINTR)
          {
-           syslog(LOG_WARNING, "write: warning: %m(%d)", errno);
+           syslog(LOG_WARNING, "write: warning: %m (%d)", errno);
          } 
        else
          {
-           syslog(LOG_ERR, "write: %m(%d)", errno);
-           die(1);
+           syslog(LOG_ERR, "write: %m (%d)", errno);
          }
       }
   }
@@ -1836,7 +1835,7 @@ int ppp_available(void)
          "This system lacks kernel support for PPP.  This could be because\n"
          "the PPP kernel module is not loaded, or because the kernel is\n"
          "not configured for PPP.  See the README.linux file in the\n"
-         "ppp-2.3.5 distribution.\n";
+         "ppp-2.3.6 distribution.\n";
     }
 /*
  *  This is the PPP device. Validate the version of the driver at this