summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2014-11-13 06:19:51 +0000
committerschwarze <schwarze@openbsd.org>2014-11-13 06:19:51 +0000
commit6afa292ff7ad9ec277dde71e77fc76a0254c37e9 (patch)
tree8d5f788ba0f53b80fb8d6f1dfd0b75b055125933
parentFix a condition which selects log level for errors on routing socket, (diff)
downloadwireguard-openbsd-6afa292ff7ad9ec277dde71e77fc76a0254c37e9.tar.xz
wireguard-openbsd-6afa292ff7ad9ec277dde71e77fc76a0254c37e9.zip
remove networks(5) support; it wasn't even documented to exist;
"just go ahead" deraadt@
-rw-r--r--usr.sbin/pppd/auth.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index ea655015fbf..6837010f532 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.32 2011/10/02 06:25:53 nicm Exp $ */
+/* $OpenBSD: auth.c,v 1.33 2014/11/13 06:19:51 schwarze Exp $ */
/*
* auth.c - PPP authentication and phase control.
@@ -1227,7 +1227,6 @@ ip_addr_check(addr, addrs)
int accept, r = 1;
char *ptr_word, *ptr_mask;
struct hostent *hp;
- struct netent *np;
/* don't allow loopback or multicast address */
if (bad_ip_adrs(addr))
@@ -1270,11 +1269,7 @@ ip_addr_check(addr, addrs)
if (hp != NULL && hp->h_addrtype == AF_INET) {
ina.s_addr = *(u_int32_t *)hp->h_addr;
} else {
- np = getnetbyname (ptr_word);
- if (np != NULL && np->n_addrtype == AF_INET)
- ina.s_addr = htonl (np->n_net);
- else
- r = inet_aton (ptr_word, &ina);
+ r = inet_aton (ptr_word, &ina);
if (ptr_mask == NULL) {
/* calculate appropriate mask for net */
ah = ntohl(ina.s_addr);