X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Futils.c;fp=pppd%2Futils.c;h=c1bdbbbfe4e52d8a06edb3c8b22462580b3644a3;hp=bd82e2b4ec20031f5db5b70246e4ab9e83654426;hb=ba7f7e053daae846a54a1d08d3d133a5f1266ace;hpb=76016e1b948b7d9675b4e0750d1f943d96d9523b diff --git a/pppd/utils.c b/pppd/utils.c index bd82e2b..c1bdbbb 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -58,7 +58,7 @@ #include #endif -#include "pppd.h" +#include "pppd-private.h" #include "fsm.h" #include "lcp.h" #include "pathnames.h" @@ -768,7 +768,7 @@ complete_read(int fd, void *buf, size_t count) for (done = 0; done < count; ) { nb = read(fd, ptr, count - done); if (nb < 0) { - if (errno == EINTR && !got_sigterm) + if (errno == EINTR && !ppp_signaled(SIGTERM)) continue; return -1; }