diff options
Diffstat (limited to 'usr.sbin/ppp')
-rw-r--r-- | usr.sbin/ppp/arp.c | 6 | ||||
-rw-r--r-- | usr.sbin/ppp/defs.h | 9 | ||||
-rw-r--r-- | usr.sbin/ppp/modem.c | 6 | ||||
-rw-r--r-- | usr.sbin/ppp/passwdauth.c | 4 | ||||
-rw-r--r-- | usr.sbin/ppp/pathnames.h | 15 | ||||
-rw-r--r-- | usr.sbin/ppp/ppp.8 | 23 | ||||
-rw-r--r-- | usr.sbin/ppp/ppp.8.m4 | 23 |
7 files changed, 44 insertions, 42 deletions
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c index 03b242e..7690897 100644 --- a/usr.sbin/ppp/arp.c +++ b/usr.sbin/ppp/arp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: arp.c,v 1.13 1997/08/25 00:29:03 brian Exp $ + * $Id: arp.c,v 1.14 1997/08/31 22:59:12 brian Exp $ * */ @@ -46,12 +46,10 @@ #endif #include <net/if_types.h> #include <netinet/in_var.h> -#include <netinet/if_ether.h> -#include "log.h" - #if RTM_VERSION >= 3 #include <netinet/if_ether.h> #endif +#include "log.h" static int rtm_seq; diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h index 7de532d..1ae8b83 100644 --- a/usr.sbin/ppp/defs.h +++ b/usr.sbin/ppp/defs.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: defs.h,v 1.17 1997/06/23 23:10:09 brian Exp $ + * $Id: defs.h,v 1.18 1997/08/25 00:29:10 brian Exp $ * * TODO: */ @@ -23,8 +23,8 @@ #ifndef _DEFS_H_ #define _DEFS_H_ -#include <machine/endian.h> #include <sys/types.h> +#include <machine/endian.h> #include <unistd.h> #include <stdlib.h> #include <stdio.h> @@ -40,9 +40,14 @@ #define MODEM_DEV "/dev/cuaa1" /* name of tty device */ #define BASE_MODEM_DEV "cuaa1" /* name of base tty device */ #else +#ifdef __OpenBSD__ +#define MODEM_DEV "/dev/cua01" /* name of tty device */ +#define BASE_MODEM_DEV "cua01" /* name of base tty device */ +#else #define MODEM_DEV "/dev/tty01" /* name of tty device */ #define BASE_MODEM_DEV "tty01" /* name of base tty device */ #endif +#endif #define MODEM_SPEED B38400 /* tty speed */ #define SERVER_PORT 3000 /* Base server port no. */ diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c index a5b7883..72d5484 100644 --- a/usr.sbin/ppp/modem.c +++ b/usr.sbin/ppp/modem.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: modem.c,v 1.49 1997/08/25 00:29:21 brian Exp $ + * $Id: modem.c,v 1.50 1997/08/31 22:59:41 brian Exp $ * * TODO: */ @@ -31,7 +31,11 @@ #include <netdb.h> #include <errno.h> #include <time.h> +#ifdef __OpenBSD__ +#include <util.h> +#else #include <libutil.h> +#endif #include "hdlc.h" #include "lcp.h" #include "ip.h" diff --git a/usr.sbin/ppp/passwdauth.c b/usr.sbin/ppp/passwdauth.c index ff63bc1..ba43e30 100644 --- a/usr.sbin/ppp/passwdauth.c +++ b/usr.sbin/ppp/passwdauth.c @@ -22,7 +22,11 @@ #include <sys/types.h> #include <utmp.h> #include <time.h> +#ifdef __OpenBSD__ +#include <util.h> +#else #include <libutil.h> +#endif #include <pwd.h> #include "fsm.h" #include "passwdauth.h" diff --git a/usr.sbin/ppp/pathnames.h b/usr.sbin/ppp/pathnames.h index e98f294..fca076b 100644 --- a/usr.sbin/ppp/pathnames.h +++ b/usr.sbin/ppp/pathnames.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * - * $Id$ + * $Id: pathnames.h,v 1.6 1997/02/22 16:10:43 peter Exp $ * * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */ @@ -40,18 +40,7 @@ #include <paths.h> #endif -#define _PATH_ACULOG "/var/log/aculog" -#if defined(__NetBSD__) || defined(__FreeBSD__) -#define _PATH_LOCKDIRNAME "/var/spool/lock/LCK..%s" -#else -#define _PATH_LOCKDIRNAME "/var/spool/uucp/LCK..%s" -#endif -#ifdef notdef -#define _PATH_LOCKDIRNAME "/var/spool/uucp/LCK/LCK..%s" -#endif -#define _PATH_PHONES "/etc/phones" -#define _PATH_REMOTE "/etc/remote" -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) #define _PATH_PPP "/etc/ppp" #else #define _PATH_PPP "/etc" diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8 index 3c3c06d..19a9fd2 100644 --- a/usr.sbin/ppp/ppp.8 +++ b/usr.sbin/ppp/ppp.8 @@ -1,4 +1,4 @@ -.\" $Id: ppp.8,v 1.62 1997/09/07 01:00:03 brian Exp $ +.\" $Id: ppp.8,v 1.63 1997/09/09 21:01:53 brian Exp $ .Dd 20 September 1995 .Os FreeBSD .Dt PPP 8 @@ -157,10 +157,10 @@ as the user id that invoked When you first run .Nm you may need to deal with some initial configuration details. First, -your kernel should include a tunnel device (the default in FreeBSD 2.0.5 -and later). If it doesn't, or if you require more than one tun interface, -you'll need to rebuild your kernel with the following line in your kernel -configuration file: +your kernel should include a tunnel device (the GENERIC kernel includes +one by default). If it doesn't, or if you require more than one tun +interface, you'll need to rebuild your kernel with the following line in +your kernel configuration file: .Dl pseudo-device tun N @@ -1180,17 +1180,18 @@ Login scripts vary greatly between ISPs. Use .Dq set line and -.Dq set sp +.Dq set speed to specify your serial line and speed, for example: .Bd -literal -offset indent set line /dev/cuaa0 set sp 115200 .Ed .Pp -Cuaa0 is the first serial port on FreeBSD. Cuaa1 is the second etc. A -speed of 115200 should be specified if you have a modem capable of bit -rates of 28800 or more. In general, the serial speed should be about -four times the modem speed. +Cuaa0 is the first serial port on FreeBSD. If you're running +.Nm +on OpenBSD, cua00 is the first. A speed of 115200 should be specified +if you have a modem capable of bit rates of 28800 or more. In general, +the serial speed should be about four times the modem speed. .It Use the @@ -2127,4 +2128,4 @@ Get port number if port number is using service name. This program was originally written by Toshiharu OHNO (tony-o@iij.ad.jp), and was submitted to FreeBSD-2.0.5 by Atsushi Murai (amurai@spec.co.jp). -It's since had an enormous face lift and looks substantially different. +It has since had an enormous face lift and looks substantially different. diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4 index 3c3c06d..19a9fd2 100644 --- a/usr.sbin/ppp/ppp.8.m4 +++ b/usr.sbin/ppp/ppp.8.m4 @@ -1,4 +1,4 @@ -.\" $Id: ppp.8,v 1.62 1997/09/07 01:00:03 brian Exp $ +.\" $Id: ppp.8,v 1.63 1997/09/09 21:01:53 brian Exp $ .Dd 20 September 1995 .Os FreeBSD .Dt PPP 8 @@ -157,10 +157,10 @@ as the user id that invoked When you first run .Nm you may need to deal with some initial configuration details. First, -your kernel should include a tunnel device (the default in FreeBSD 2.0.5 -and later). If it doesn't, or if you require more than one tun interface, -you'll need to rebuild your kernel with the following line in your kernel -configuration file: +your kernel should include a tunnel device (the GENERIC kernel includes +one by default). If it doesn't, or if you require more than one tun +interface, you'll need to rebuild your kernel with the following line in +your kernel configuration file: .Dl pseudo-device tun N @@ -1180,17 +1180,18 @@ Login scripts vary greatly between ISPs. Use .Dq set line and -.Dq set sp +.Dq set speed to specify your serial line and speed, for example: .Bd -literal -offset indent set line /dev/cuaa0 set sp 115200 .Ed .Pp -Cuaa0 is the first serial port on FreeBSD. Cuaa1 is the second etc. A -speed of 115200 should be specified if you have a modem capable of bit -rates of 28800 or more. In general, the serial speed should be about -four times the modem speed. +Cuaa0 is the first serial port on FreeBSD. If you're running +.Nm +on OpenBSD, cua00 is the first. A speed of 115200 should be specified +if you have a modem capable of bit rates of 28800 or more. In general, +the serial speed should be about four times the modem speed. .It Use the @@ -2127,4 +2128,4 @@ Get port number if port number is using service name. This program was originally written by Toshiharu OHNO (tony-o@iij.ad.jp), and was submitted to FreeBSD-2.0.5 by Atsushi Murai (amurai@spec.co.jp). -It's since had an enormous face lift and looks substantially different. +It has since had an enormous face lift and looks substantially different. |