diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-10-06 06:32:55 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-10-06 06:32:55 +0000 |
| commit | 6b7530f62a64684a7af6414a2bef656075f9acc8 (patch) | |
| tree | fa92aedb6dd3cf4112ac31f8dc7ca70d15a7683b | |
| parent | f8f7fdaee3b8c22116fa413e469f92fb20cbaf6a (diff) | |
fix the SIOCGIFCONF code; bug found by markc@
| -rw-r--r-- | sbin/ipnat/ipnat.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sbin/ipnat/ipnat.c b/sbin/ipnat/ipnat.c index 4434ef64581..1312ccb5166 100644 --- a/sbin/ipnat/ipnat.c +++ b/sbin/ipnat/ipnat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipnat.c,v 1.23 1998/09/15 09:57:29 pattonme Exp $ */ +/* $OpenBSD: ipnat.c,v 1.24 1998/10/06 06:32:54 deraadt Exp $ */ /* * Copyright (C) 1993-1997 by Darren Reed. * @@ -67,7 +67,7 @@ extern char *sys_errlist[]; #if !defined(lint) static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipnat.c,v 1.23 1998/09/15 09:57:29 pattonme Exp $"; +static const char rcsid[] = "@(#)$Id: ipnat.c,v 1.24 1998/10/06 06:32:54 deraadt Exp $"; #endif @@ -490,14 +490,9 @@ char *name; (ifr->ifr_addr.sa_len > sizeof(struct sockaddr) ? ifr->ifr_addr.sa_len : sizeof(struct sockaddr)); - if (!strncmp(ifreq.ifr_name, ifr->ifr_name, - sizeof(ifr->ifr_name))) - continue; ifreq = *ifr; - if (ioctl(s, SIOCGIFADDR, (caddr_t)ifr) < 0) { - warn("SIOCGIFADDR"); - goto if_addr_lose; - } + if (ioctl(s, SIOCGIFADDR, (caddr_t)ifr) < 0) + continue; if (ifr->ifr_addr.sa_family != AF_INET) continue; if (!strcmp(name, ifr->ifr_name)) { |