long nightmares

5 files changed, 30 insertions, 30 deletions

diff --git a/usr.sbin/pppd/bpf_compile.h b/usr.sbin/pppd/bpf_compile.h
index 583e6781d5d..56c07dbb709 100644
--- a/usr.sbin/pppd/bpf_compile.h
+++ b/usr.sbin/pppd/bpf_compile.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf_compile.h,v 1.1 1996/03/25 15:55:31 niklas Exp $	*/
+/*	$OpenBSD: bpf_compile.h,v 1.2 1997/06/27 02:16:21 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994
@@ -52,8 +52,8 @@ char	*bpf_geterr __P((void));
 unsigned int bpf_filter __P((struct bpf_insn *, unsigned char *,
 			     unsigned int, unsigned int));
 
-unsigned long	**pcap_nametoaddr __P((const char *));
-unsigned long	pcap_nametonetaddr __P((const char *));
+u_int32_t	**pcap_nametoaddr __P((const char *));
+u_int32_t	pcap_nametonetaddr __P((const char *));
 
 int	pcap_nametoport __P((const char *, int *, int *));
 int	pcap_nametoproto __P((const char *));
@@ -67,6 +67,6 @@ int	pcap_nametopppproto __P((const char *));
  */
 #define PROTO_UNDEF		-1
 
-unsigned long	__pcap_atoin __P((const char *));
+u_int32_t	__pcap_atoin __P((const char *));
 
 #endif /* _BPF_COMPILE_H */
diff --git a/usr.sbin/pppd/gencode.c b/usr.sbin/pppd/gencode.c
index f7f2e94aa21..91eaae9dfde 100644
--- a/usr.sbin/pppd/gencode.c
+++ b/usr.sbin/pppd/gencode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencode.c,v 1.1 1996/03/25 15:55:40 niklas Exp $	*/
+/*	$OpenBSD: gencode.c,v 1.2 1997/06/27 02:16:22 deraadt Exp $	*/
 /*	From NetBSD: gencode.c,v 1.2 1995/03/06 11:38:21 mycroft Exp */
 
 /*
@@ -26,7 +26,7 @@
 from: static char rcsid[] =
     "@(#) Header: gencode.c,v 1.55 94/06/20 19:07:53 leres Exp (LBL)";
 #else
-static char rcsid[] = "$OpenBSD: gencode.c,v 1.1 1996/03/25 15:55:40 niklas Exp $";
+static char rcsid[] = "$OpenBSD: gencode.c,v 1.2 1997/06/27 02:16:22 deraadt Exp $";
 #endif
 #endif
 
@@ -137,8 +137,8 @@ struct block *gen_portop(int, int, int);
 static struct block *gen_port(int, int, int);
 static int lookup_proto(char *, int);
 static struct block *gen_proto(int, int, int);
-static u_long net_mask(u_long *);
-static u_long net_mask(u_long *);
+static u_int32_t net_mask(u_int32_t *);
+static u_int32_t net_mask(u_int32_t *);
 static struct slist *xfer_to_x(struct arth *);
 static struct slist *xfer_to_a(struct arth *);
 static struct block *gen_len(int, int);
@@ -773,11 +773,11 @@ gen_proto(v, proto, dir)
 /*
  * Left justify 'addr' and return its resulting network mask.
  */
-static unsigned long
+static u_int32_t
 net_mask(addr)
-	unsigned long *addr;
+	u_int32_t *addr;
 {
-	register unsigned long m = 0xffffffff;
+	register u_int32_t m = 0xffffffff;
 
 	if (*addr)
 		while ((*addr & 0xff000000) == 0)
@@ -793,7 +793,7 @@ gen_scode(name, q)
 {
 	int proto = q.proto;
 	int dir = q.dir;
-	unsigned long mask, addr, **alist;
+	u_int32_t mask, addr, **alist;
 	struct block *b, *tmp;
 	int port, real_proto;
 
@@ -863,10 +863,10 @@ gen_scode(name, q)
 
 struct block *
 gen_ncode(v, q)
-	unsigned long v;
+	u_int32_t v;
 	struct qual q;
 {
-	unsigned long mask;
+	u_int32_t mask;
 	int proto = q.proto;
 	int dir = q.dir;
 
diff --git a/usr.sbin/pppd/gencode.h b/usr.sbin/pppd/gencode.h
index 9b3b99cad19..c6786195f6b 100644
--- a/usr.sbin/pppd/gencode.h
+++ b/usr.sbin/pppd/gencode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencode.h,v 1.1 1996/03/25 15:55:41 niklas Exp $	*/
+/*	$OpenBSD: gencode.h,v 1.2 1997/06/27 02:16:22 deraadt Exp $	*/
 /*	$NetBSD: gencode.h,v 1.1 1996/03/15 03:09:12 paulus Exp $	*/
 
 /*
@@ -142,7 +142,7 @@ void gen_not __P((struct block *));
 
 struct block *gen_scode __P((char *, struct qual));
 struct block *gen_ecode __P((unsigned char *, struct qual));
-struct block *gen_ncode __P((unsigned long, struct qual));
+struct block *gen_ncode __P((u_int32_t, struct qual));
 struct block *gen_proto_abbrev __P((int));
 struct block *gen_relation __P((int, struct arth *, struct arth *, int));
 struct block *gen_less __P((int));
diff --git a/usr.sbin/pppd/nametoaddr.c b/usr.sbin/pppd/nametoaddr.c
index a56818d4838..b979a8775db 100644
--- a/usr.sbin/pppd/nametoaddr.c
+++ b/usr.sbin/pppd/nametoaddr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nametoaddr.c,v 1.3 1996/08/22 22:52:52 niklas Exp $	*/
+/*	$OpenBSD: nametoaddr.c,v 1.4 1997/06/27 02:16:23 deraadt Exp $	*/
 /*	From NetBSD: nametoaddr.c,v 1.3 1995/04/29 05:42:23 cgd Exp */
 
 /*
@@ -30,7 +30,7 @@
 from: static char rcsid[] =
     "@(#) Header: nametoaddr.c,v 1.21 94/06/20 19:07:54 leres Exp (LBL)";
 #else
-static char rcsid[] = "$OpenBSD: nametoaddr.c,v 1.3 1996/08/22 22:52:52 niklas Exp $";
+static char rcsid[] = "$OpenBSD: nametoaddr.c,v 1.4 1997/06/27 02:16:23 deraadt Exp $";
 #endif
 #endif
 
@@ -65,24 +65,24 @@ static char rcsid[] = "$OpenBSD: nametoaddr.c,v 1.3 1996/08/22 22:52:52 niklas E
  *  Convert host name to internet address.
  *  Return 0 upon failure.
  */
-u_long **
+u_int32_t **
 pcap_nametoaddr(const char *name)
 {
 #ifndef h_addr
-	static u_long *hlist[2];
+	static u_int32_t *hlist[2];
 #endif
-	u_long **p;
+	u_int32_t **p;
 	struct hostent *hp;
 
 	if ((hp = gethostbyname(name)) != NULL) {
 #ifndef h_addr
-		hlist[0] = (u_long *)hp->h_addr;
+		hlist[0] = (u_int32_t *)hp->h_addr;
 		NTOHL(hp->h_addr);
 		return hlist;
 #else
-		for (p = (u_long **)hp->h_addr_list; *p; ++p)
+		for (p = (u_int32_t **)hp->h_addr_list; *p; ++p)
 			NTOHL(**p);
-		return (u_long **)hp->h_addr_list;
+		return (u_int32_t **)hp->h_addr_list;
 #endif
 	}
 	else
@@ -93,7 +93,7 @@ pcap_nametoaddr(const char *name)
  *  Convert net name to internet address.
  *  Return 0 upon failure.
  */
-u_long
+u_int32_t
 pcap_nametonetaddr(const char *name)
 {
 	struct netent *np;
@@ -170,10 +170,10 @@ pcap_nametoproto(const char *str)
 		return PROTO_UNDEF;
 }
 
-u_long
+u_int32_t
 __pcap_atoin(const char *s)
 {
-	u_long addr = 0;
+	u_int32_t addr = 0;
 	u_int n;
 
 	while (1) {
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 0a18b705d5e..8ec932dcb71 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys-bsd.c,v 1.6 1997/04/27 21:45:16 deraadt Exp $	*/
+/*	$OpenBSD: sys-bsd.c,v 1.7 1997/06/27 02:16:23 deraadt Exp $	*/
 
 /*
  * sys-bsd.c - System-dependent procedures for setting up
@@ -23,7 +23,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.6 1997/04/27 21:45:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.7 1997/06/27 02:16:23 deraadt Exp $";
 #endif
 
 /*
@@ -313,7 +313,7 @@ restore_loop()
 int
 sipxfaddr(unit, network, node)
 	  int unit;
-	  u_long network;
+	  u_int32_t network;
 	  u_char * node;
 {
 	int    skfd;