From 7288c50357ad237094bfb43ae26c4927640190f4 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 23 Jun 1998 21:58:41 +0000
Subject: [PATCH] Merge ppp 2.3.3 -> 2.3.5 changes (for what it's worth)

---
 usr.bin/chat/chat.8 |  8 ++------
 usr.bin/chat/chat.c | 12 +++++++++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index dd478ae6faba..26ef735b53c9 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $Id: chat.8,v 1.10 1998/03/21 20:46:59 peter Exp $
+.\" $Id: chat.8,v 1.11 1998/06/03 04:21:36 jkoshy Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -65,11 +65,7 @@ Request that the \fIchat\fR script be executed in a stderr verbose
 mode. The \fIchat\fR program will then log all text received from the
 modem and the output strings sent to the modem to the stderr device. This
 device is usually the local console at the station running the chat or
-pppd program. This option will not work properly if the stderr is
-redirected to the /dev/null location as is the case should pppd be run
-in the 'detached' mode. In that case, use the '-v' option to record
-the session via
-.IR syslog (3).
+pppd program.
 .TP
 .B -s
 Use stderr.  All log messages from '-v' and all error messages will be
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index a7bff26a2514..f3676aa02799 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -78,7 +78,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chat.c,v 1.10 1997/12/29 00:08:52 alex Exp $";
+static char rcsid[] = "$Id: chat.c,v 1.11 1998/03/21 20:47:04 peter Exp $";
 #endif
 
 #include <stdio.h>
@@ -1412,6 +1412,16 @@ register char *string;
     return (0);
 }
 
+/*
+ * Gross kludge to handle Solaris versions >= 2.6 having usleep.
+ */
+#ifdef SOL2
+#include <sys/param.h>
+#if MAXUID > 65536		/* then this is Solaris 2.6 or later */
+#undef NO_USLEEP
+#endif
+#endif /* SOL2 */
+
 #ifdef NO_USLEEP
 #include <sys/types.h>
 #include <sys/time.h>