Merge the NETGRAPH branch into HEAD. tty devices now use netgraph's line

discipline to do the async escaping, but no other benefits are available yet.

Change ``ifdef HAVE_DES'' to ``ifndef NODES'' for consistency.

Make the Makefile a little more sane WRT RELEASE_CRUNCH.

1 files changed, 5 insertions, 3 deletions

diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index a81ab0e..3bd3bae 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -516,10 +516,12 @@ chat_Write(struct fdescriptor *d, struct bundle *bundle, const fd_set *fdset)
     }
 
     wrote = physical_Write(c->physical, c->argptr, c->arglen);
-    result = wrote ? 1 : 0;
+    result = wrote > 0 ? 1 : 0;
     if (wrote == -1) {
-      if (errno != EINTR)
-        log_Printf(LogERROR, "chat_Write: %s\n", strerror(errno));
+      if (errno != EINTR) {
+        log_Printf(LogWARN, "chat_Write: %s\n", strerror(errno));
+	result = -1;
+      }
       if (physical_IsSync(c->physical)) {
         c->argptr += 2;
         c->arglen -= 2;