Remove trailing whitespace.

33 files changed, 121 insertions, 121 deletions

diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index 6208383..4969f2d 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: arp.c,v 1.1 1995/02/26 12:17:09 amurai Exp $
+ *
  */
 
 /*
@@ -321,15 +321,15 @@ struct nlist nl[] = {
 
 kvm_t *kvmd;
 
-/*              
+/*
  * Read kernel memory, return 0 on success.
- */     
+ */
 int
-kread(addr, buf, size)  
+kread(addr, buf, size)
   u_long addr;
   char *buf;
   int size;
-{        
+{
 
 	if (kvm_read(kvmd, addr, buf, size) != size) {
 		/* XXX this duplicates kvm_read's error printout */
@@ -351,10 +351,10 @@ struct sockaddr_dl *dlo;
   struct sockaddr *sa;
   char *cp;
   struct sockaddr_dl *sdl;
-  union {          
+  union {
 	  struct ifaddr ifa;
 	  struct in_ifaddr in;
-  } ifaddr; 
+  } ifaddr;
   struct arpcom ac;
 
   kvmd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index 472d723..70c1a48 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: async.c,v 1.2 1995/02/26 12:17:11 amurai Exp $
- * 
+ * $Id: async.c,v 1.3 1995/04/16 12:06:39 amurai Exp $
+ *
  */
 #include "fsm.h"
 #include "hdlc.h"
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index a125abc..c2efa7b 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: auth.c,v 1.2 1995/02/26 12:17:12 amurai Exp $
- * 
+ *
+ * $Id: auth.c,v 1.3 1995/02/27 10:57:38 amurai Exp $
+ *
  *	TODO:
  *		o Imprement check against with registerd IP addresses.
  */
diff --git a/usr.sbin/ppp/auth.h b/usr.sbin/ppp/auth.h
index cab8695..952ff2e 100644
--- a/usr.sbin/ppp/auth.h
+++ b/usr.sbin/ppp/auth.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
+ * $Id: auth.h,v 1.1 1995/02/27 03:17:51 amurai Exp $
  *
  *	TODO:
  */
@@ -24,7 +24,7 @@
 #define	_AUTH_H_
 
 typedef enum { VALID, INVALID, NOT_FOUND } LOCAL_AUTH_VALID;
-LOCAL_AUTH_VALID	LocalAuthValidate( char *, char *, char *); 
+LOCAL_AUTH_VALID	LocalAuthValidate( char *, char *, char *);
 
 struct authinfo {
   void (*ChallengeFunc)();
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index ca3a8e8..eb7287b 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: ccp.c,v 1.2 1995/02/26 12:17:14 amurai Exp $
+ *
  *	TODO:
  *		o Support other compression protocols
  */
@@ -29,7 +29,7 @@
 #include "phase.h"
 #include "vars.h"
 #include "cdefs.h"
- 
+
 extern void PutConfValue __P((void));
 
 struct ccpstate CcpInfo;
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 18ded48..adc43af 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: chap.c,v 1.2 1995/02/26 12:17:17 amurai Exp $
+ *
  *	TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 0fba4cf..ebfefe8 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -17,9 +17,9 @@
  *		1760 Zollinger Road
  *		Columbus, OH  43221
  *		(614)451-1883
- * 
- * $Id: chat.c,v 1.2 1995/02/26 12:17:20 amurai Exp $
- * 
+ *
+ * $Id: chat.c,v 1.3 1995/03/11 15:18:37 amurai Exp $
+ *
  *  TODO:
  *	o Support more UUCP compatible control sequences.
  *	o Dialing shoud not block monitor process.
@@ -453,7 +453,7 @@ char *script;
 #ifdef DEBUG
   int i;
 #endif
-  
+
   timeout_next = abort_next = 0;
   for (n = 0; AbortStrings[n]; n++) {
     free(AbortStrings[n]);
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index b926879..dbe4247 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: command.c,v 1.3 1995/02/27 10:57:45 amurai Exp $
- * 
+ *
+ * $Id: command.c,v 1.4 1995/04/16 13:38:38 amurai Exp $
+ *
  */
 #include <ctype.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index e803ef2..60a5cfb 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: filter.c,v 1.3 1995/02/26 12:17:25 amurai Exp $
+ *
  *	TODO: Shoud send ICMP error message when we discard packets.
  */
 
@@ -80,7 +80,7 @@ int *pwidth;
     /* if width is not given, assume whole 32 bits are meaningfull */
     bits = 32;
   }
-  
+
   *pwidth = bits;
   pmask->s_addr = htonl(netmasks[bits]);
 
@@ -246,7 +246,7 @@ checkestab:
       printf("estab is expected.\n");
       return(0);
     }
-    
+
     return(1);
   } else if (argc == 1)
     goto checkestab;
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index e1e8d99..3df063a 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: fsm.c,v 1.2 1995/02/26 12:17:27 amurai Exp $
+ *
  *  TODO:
  *		o Refer loglevel for log output
  *		o Better option log display
@@ -323,7 +323,7 @@ struct mbuf *bp;
 {
   int plen, flen;
   int ackaction = 0;
- 
+
   plen = plength(bp);
   flen = ntohs(lhp->length) - sizeof(*lhp);
   if (plen < flen) {
@@ -446,7 +446,7 @@ struct fsmheader *lhp;
 struct mbuf *bp;
 {
   int plen, flen;
- 
+
   plen = plength(bp);
   flen = ntohs(lhp->length) - sizeof(*lhp);
   if (plen < flen) {
@@ -563,7 +563,7 @@ struct fsmheader *lhp;
 struct mbuf *bp;
 {
   int plen, flen;
- 
+
   plen = plength(bp);
   flen = ntohs(lhp->length) - sizeof(*lhp);
   if (plen < flen) {
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 6431e38..f1de57e 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: hdlc.c,v 1.2 1995/02/26 12:17:30 amurai Exp $
+ *
  *	TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index c0dd7e8..c25b56c 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: ip.c,v 1.2 1995/02/26 12:17:33 amurai Exp $
- * 
+ *
+ * $Id: ip.c,v 1.3 1995/03/11 15:18:42 amurai Exp $
+ *
  *	TODO:
  *		o Return ICMP message for filterd packet
  *		  and optionaly record it into log.
@@ -240,7 +240,7 @@ int direction;
   logit = (loglevel & (1 << LOG_TCPIP));
 
   pip = (struct ip *)cp;
-  
+
   if (logit) logprintf("%s  ", Direction[direction]);
 
   ptop = (cp + (pip->ip_hl << 2));
@@ -379,7 +379,7 @@ int count;
   Enqueue(&IpOutputQueues[pri], bp);
 }
 
-int 
+int
 IsIpEnqueued()
 {
   struct mqueue *queue;
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index c8cb6ae..240c0c6 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.c,v 1.2 1995/02/26 12:17:33 amurai Exp $
- * 
+ * $Id: ipcp.c,v 1.3 1995/03/11 15:18:44 amurai Exp $
+ *
  *	TODO:
  *		o More RFC1772 backwoard compatibility
  */
@@ -331,7 +331,7 @@ int mode;
           bcopy(&IpcpInfo.his_ipaddr.s_addr, nakp+2, length);
           nakp += length;
           break;
-	  
+
 	}
 	IpcpInfo.his_ipaddr = ipaddr;
 	bcopy(cp, ackp, length);
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index 0f7d9b1..ade676e 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id: lcp.c,v 1.2 1995/02/26 12:17:35 amurai Exp $
- * 
+ *
+ * $Id: lcp.c,v 1.3 1995/03/11 15:18:45 amurai Exp $
+ *
  * TODO:
  *      o Validate magic number received from peer.
  *	o Limit data field length by MRU
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index 235321f..7443022 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: log.c,v 1.2 1995/02/26 12:17:38 amurai Exp $
+ *
  */
 #include "defs.h"
 #include <time.h>
@@ -248,7 +248,7 @@ LogTimeStamp()
     mypid = getpid();
   ltime = time(0);
   ptm = localtime(&ltime);
-  sprintf(logptr, "%02d-%02d %02d:%02d:%02d [%d] ", 
+  sprintf(logptr, "%02d-%02d %02d:%02d:%02d [%d] ",
     ptm->tm_mon + 1, ptm->tm_mday,
 	ptm->tm_hour, ptm->tm_min, ptm->tm_sec, mypid);
   logptr += strlen(logptr);
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index ed375ce..eaa677c 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lqr.c,v 1.2 1995/02/26 12:17:39 amurai Exp $
- * 
+ * $Id: lqr.c,v 1.3 1995/04/17 04:21:35 amurai Exp $
+ *
  *	o LQR based on RFC1333
  *
  * TODO:
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 3f8126f..a698a04 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: main.c,v 1.3 1995/02/27 10:57:50 amurai Exp $
- * 
+ * $Id: main.c,v 1.4 1995/03/11 15:18:47 amurai Exp $
+ *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
  *		o Add signal handler for misc controls.
@@ -573,7 +573,7 @@ DoLoop()
 
   dial_up = FALSE;			/* XXXX */
   for (;;) {
-    if ( modem ) 
+    if ( modem )
 	IpStartOutput();
     FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&efds);
 
@@ -638,10 +638,10 @@ DoLoop()
     tp = (RedialTimer.state == TIMER_RUNNING)? &timeout : NULL;
     i = select(tun_in+10, &rfds, &wfds, &efds, tp);
 #else
-    /* 
+    /*
      * When SIGALRM timer is running, a select function will be
-     * return -1 and EINTR after a Time Service signal hundler 
-     * is done. 
+     * return -1 and EINTR after a Time Service signal hundler
+     * is done.
      */
     i = select(tun_in+10, &rfds, &wfds, &efds, NULL);
 #endif
@@ -655,7 +655,7 @@ DoLoop()
        }
        perror("select");
        break;
-    } 
+    }
 
     if ((netfd > 0 && FD_ISSET(netfd, &efds)) || FD_ISSET(modem, &efds)) {
       logprintf("Exception detected.\n");
@@ -747,7 +747,7 @@ DoLoop()
        */
       if (ModemQlen() > 5)
 	continue;
-      
+
       n = read(tun_in, rbuff, sizeof(rbuff));
       if (n < 0) {
 	perror("read from tun");
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 6eaea88..c371a64 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: mbuf.c,v 1.2 1995/02/26 12:17:42 amurai Exp $
+ *
  */
 #include "defs.h"
 
@@ -112,7 +112,7 @@ int len;
   }
   return(bp);
 }
-  
+
 void
 mbwrite(bp, ptr, cnt)
 struct mbuf *bp;
diff --git a/usr.sbin/ppp/md5.h b/usr.sbin/ppp/md5.h
index dc07614..f6f5b9b 100644
--- a/usr.sbin/ppp/md5.h
+++ b/usr.sbin/ppp/md5.h
@@ -3,25 +3,25 @@
  *
  * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
  * rights reserved.
- * 
+ *
  * License to copy and use this software is granted provided that it
  * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
  * Algorithm" in all material mentioning or referencing this software
  * or this function.
- * 
+ *
  * License is also granted to make and use derivative works provided
  * that such works are identified as "derived from the RSA Data
  * Security, Inc. MD5 Message-Digest Algorithm" in all material
  * mentioning or referencing the derived work.
- * 
+ *
  * RSA Data Security, Inc. makes no representations concerning either
  * the merchantability of this software or the suitability of this
  * software for any particular purpose. It is provided "as is"
  * without express or implied warranty of any kind.
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
- * 
- * $Id:$
+ *
+ * $Id: md5.h,v 1.1.1.1 1995/01/31 06:29:56 amurai Exp $
  *
  */
 
diff --git a/usr.sbin/ppp/md5c.c b/usr.sbin/ppp/md5c.c
index 173b536..e2695f2 100644
--- a/usr.sbin/ppp/md5c.c
+++ b/usr.sbin/ppp/md5c.c
@@ -1,7 +1,7 @@
 /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- * 
- * $Id:$
- * 
+ *
+ * $Id: md5c.c,v 1.2 1995/02/26 12:17:44 amurai Exp $
+ *
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index 5595bc9..0a25156 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.c,v 1.4 1995/03/11 15:18:48 amurai Exp $
- * 
+ * $Id: modem.c,v 1.5 1995/04/16 13:38:39 amurai Exp $
+ *
  *  TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/os.c b/usr.sbin/ppp/os.c
index 11fb9a6..92acff6 100644
--- a/usr.sbin/ppp/os.c
+++ b/usr.sbin/ppp/os.c
@@ -16,9 +16,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: os.c,v 1.2 1995/02/26 12:17:48 amurai Exp $
+ *
  */
 #include "fsm.h"
 #include <sys/param.h>
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 38ced43..0c06307 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -18,8 +18,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: pap.c,v 1.2 1995/02/26 12:17:51 amurai Exp $
+ *
  *	TODO:
  */
 #include "fsm.h"
@@ -66,7 +66,7 @@ int papid;
   cp += namelen;
   *cp++ = keylen;
   bcopy(VarAuthKey, cp, keylen);
- 
+
   HdlcOutput(PRI_NORMAL, PROTO_PAP, bp);
 }
 
diff --git a/usr.sbin/ppp/pathnames.h b/usr.sbin/ppp/pathnames.h
index ed5c7f4..fbabf37 100644
--- a/usr.sbin/ppp/pathnames.h
+++ b/usr.sbin/ppp/pathnames.h
@@ -30,9 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 
- * $Id:$
- * 
+ *
+ * $Id: pathnames.h,v 1.3 1995/02/26 12:17:52 amurai Exp $
+ *
  *	@(#)pathnames.h	5.2 (Berkeley) 6/1/90
  */
 
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 826cd5c..d0bffb5 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -4,9 +4,9 @@
 #include "ccp.h"
 
 /*
- * 
- * $Id:$
- * 
+ *
+ * $Id: pred.c,v 1.2 1995/02/26 12:17:55 amurai Exp $
+ *
  * pred.c -- Test program for Dave Rand's rendition of the
  * predictor algorithm
  * Updated by: iand@labtam.labtam.oz.au (Ian Donaldson)
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index f36cfcb..5d82670 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: route.c,v 1.2 1995/02/26 12:17:56 amurai Exp $
+ *
  */
 #include <sys/types.h>
 #include <machine/endian.h>
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index f3d57ce..5bf842a 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: slcompress.c,v 1.2 1995/02/26 12:17:57 amurai Exp $
+ *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  */
diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h
index ee1fe77..4e0b8ba 100644
--- a/usr.sbin/ppp/slcompress.h
+++ b/usr.sbin/ppp/slcompress.h
@@ -1,7 +1,7 @@
 /*
  * Definitions for tcp compression routines.
  *
- * $Header: /home/tony-o/src/ppp/RCS/slcompress.h,v 1.1 1993/09/11 05:30:49 tony-o Exp tony-o $
+ * $Header: /home/ncvs/src/usr.sbin/ppp/slcompress.h,v 1.2 1995/02/26 12:17:58 amurai Exp $
  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
@@ -17,9 +17,9 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * $Id:$
- * 
+ *
+ * $Id: slcompress.h,v 1.2 1995/02/26 12:17:58 amurai Exp $
+ *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
  */
@@ -40,7 +40,7 @@
  * sequence number changes, one change per bit set in the header
  * (there may be no changes and there are two special cases where
  * the receiver implicitly knows what changed -- see below).
- * 
+ *
  * There are 5 numbers which can change (they are always inserted
  * in the following order): TCP urgent pointer, window,
  * acknowlegement, sequence number and IP ID.  (The urgent pointer
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index 340d3e7..bc4a750 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: systems.c,v 1.3 1995/02/26 12:17:59 amurai Exp $
- * 
+ * $Id: systems.c,v 1.4 1995/04/29 13:38:14 ache Exp $
+ *
  *  TODO:
  */
 #include "fsm.h"
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index b91fbcd..d76ab14 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -17,15 +17,15 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: timer.c,v 1.2 1995/02/26 12:18:01 amurai Exp $
- * 
+ * $Id: timer.c,v 1.3 1995/03/11 15:18:51 amurai Exp $
+ *
  *  TODO:
  */
 #include "defs.h"
 #include <sys/time.h>
 #include <signal.h>
 #include "timeout.h"
-#ifdef SIGALRM 
+#ifdef SIGALRM
 #include <errno.h>
 #endif
 void StopTimerNoBlock( struct pppTimer *);
@@ -180,7 +180,7 @@ TimerService()
 #endif
 	if (exp->func)
 	  (*exp->func)(exp->arg);
-	/* 
+	/*
          * Just Removing each item from expired list
          * And exp->enext will be intialized at next expire
          * in this funtion.
@@ -212,7 +212,7 @@ u_int sleep( u_int sec )
   gettimeofday( &st, NULL );
   to.tv_sec =  sec;
   to.tv_usec = 0;
-  std = st.tv_sec * 1000000 + st.tv_usec; 
+  std = st.tv_sec * 1000000 + st.tv_usec;
   for (;;) {
     if ( select ( 0, NULL, NULL, NULL, &to) == 0 ||
          errno != EINTR ) {
@@ -221,7 +221,7 @@ u_int sleep( u_int sec )
        gettimeofday( &et, NULL );
        sld = to.tv_sec * 1000000 + to.tv_sec;
        nwd = et.tv_sec * 1000000 + et.tv_usec - std;
-       if ( sld > nwd ) 
+       if ( sld > nwd )
           sld -= nwd;
        else
           sld  = 1; /* Avoid both tv_sec/usec is 0 */
@@ -241,7 +241,7 @@ void usleep( u_int usec)
   gettimeofday( &st, NULL );
   to.tv_sec =  0;
   to.tv_usec = usec;
-  std = st.tv_sec * 1000000 + st.tv_usec; 
+  std = st.tv_sec * 1000000 + st.tv_usec;
   for (;;) {
     if ( select ( 0, NULL, NULL, NULL, &to) == 0 ||
          errno != EINTR ) {
@@ -250,7 +250,7 @@ void usleep( u_int usec)
        gettimeofday( &et, NULL );
        sld = to.tv_sec * 1000000 + to.tv_sec;
        nwd = et.tv_sec * 1000000 + et.tv_usec - std;
-       if ( sld > nwd ) 
+       if ( sld > nwd )
           sld -= nwd;
        else
           sld  = 1; /* Avoid both tv_sec/usec is 0 */
diff --git a/usr.sbin/ppp/uucplock.c b/usr.sbin/ppp/uucplock.c
index 455c8c4..2a9e384 100644
--- a/usr.sbin/ppp/uucplock.c
+++ b/usr.sbin/ppp/uucplock.c
@@ -29,9 +29,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $Id: uucplock.c,v 1.2 1995/02/26 12:18:04 amurai Exp $
- * 
+ *
+ * $Id: uucplock.c,v 1.4 1995/03/11 15:18:53 amurai Exp $
+ *
  */
 
 #ifndef lint
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)uucplock.c	5.5 (Berkeley) 6/1/90";
 #include <errno.h>
 #include "pathnames.h"
 
-/* 
+/*
  * uucp style locking routines
  * return: 0 - success
  * 	  -1 - failure
diff --git a/usr.sbin/ppp/vars.c b/usr.sbin/ppp/vars.c
index c984d12..ef5c796 100644
--- a/usr.sbin/ppp/vars.c
+++ b/usr.sbin/ppp/vars.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: vars.c,v 1.2 1995/02/26 12:18:05 amurai Exp $
+ *
  */
 #include "fsm.h"
 #include "command.h"
@@ -46,7 +46,7 @@ struct confdesc pppConfs[] = {
 
 struct pppvars pppVars = {
   DEF_MRU, 0, MODEM_SPEED, CS8, 180, 30, 3,
-  MODEM_DEV, OPEN_PASSIVE, LOCAL_NO_AUTH, 
+  MODEM_DEV, OPEN_PASSIVE, LOCAL_NO_AUTH,
 };
 
 int
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 8c5df56..0c9c856 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -17,8 +17,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
- * 
+ * $Id: vjcomp.c,v 1.2 1995/02/26 12:18:08 amurai Exp $
+ *
  *  TODO:
  */
 #include "fsm.h"