summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2002-07-18 19:02:13 +0000
committerderaadt <deraadt@openbsd.org>2002-07-18 19:02:13 +0000
commitd7e581110f70a9758ca14c1c0cb7f40205502da2 (patch)
tree3ec0ff91e35546e52b5f63f342636d9023477dc2
parentRemove unused calls to inet_addr() (diff)
downloadwireguard-openbsd-d7e581110f70a9758ca14c1c0cb7f40205502da2.tar.xz
wireguard-openbsd-d7e581110f70a9758ca14c1c0cb7f40205502da2.zip
use inet_aton() instead of inet_addr(); millert ok
-rw-r--r--usr.sbin/pppd/auth.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 099b2338abe..4d024791768 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.23 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: auth.c,v 1.24 2002/07/18 19:02:13 deraadt Exp $ */
/*
* auth.c - PPP authentication and phase control.
@@ -61,7 +61,7 @@
#if 0
static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: auth.c,v 1.23 2002/07/01 19:31:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: auth.c,v 1.24 2002/07/18 19:02:13 deraadt Exp $";
#endif
#endif
@@ -1180,17 +1180,15 @@ set_allowed_addrs(unit, addrs)
if (addrs != NULL && addrs->next == NULL) {
char *p = addrs->word;
struct ipcp_options *wo = &ipcp_wantoptions[unit];
- u_int32_t a;
+ struct in_addr ina;
struct hostent *hp;
if (*p != '!' && *p != '-' && !ISWILD(p) && strchr(p, '/') == NULL) {
hp = gethostbyname(p);
if (hp != NULL && hp->h_addrtype == AF_INET)
- a = *(u_int32_t *)hp->h_addr;
- else
- a = inet_addr(p);
- if (a != (u_int32_t) -1)
- wo->hisaddr = a;
+ wo->hisaddr = *(u_int32_t *)hp->h_addr;
+ else if (inet_aton(p, &ina) == 1)
+ wo->hisaddr = ina.s_addr;
}
}
}