X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fsys-solaris.c;h=a85c73301ed2b474ee644f170ff733714811306d;hb=2a7981f8ca0fc6660146885b75f7a663fe221119;hp=0b993a50139ed0136d8511f7ee5838c64ea6e0df;hpb=a1e950a04bcd9b19be22c19aa3bdaa66d9538701;p=ppp.git

diff --git a/pppd/sys-solaris.c b/pppd/sys-solaris.c
index 0b993a5..a85c733 100644
--- a/pppd/sys-solaris.c
+++ b/pppd/sys-solaris.c
@@ -114,6 +114,7 @@
 #include <sys/dlpi.h>
 #include <sys/stat.h>
 #include <sys/mkdev.h>
+#include <sys/time.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/route.h>
@@ -2426,7 +2427,7 @@ dlpi_get_reply(fd, reply, expected_prim, maxlen)
     pfd.events = POLLIN | POLLPRI;
     do {
 	n = poll(&pfd, 1, 1000);
-    } while (n == -1 && errno == EINTR);
+    } while (n == -1 && errno == EINTR && !got_sigterm);
     if (n <= 0)
 	return -1;
 
@@ -2863,3 +2864,13 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
 
     return 1;
 }
+
+/********************************************************************
+ *
+ * get_time - Get current time, monotonic if possible.
+ */
+int
+get_time(struct timeval *tv)
+{
+    return gettimeofday(tv, NULL);
+}