diff options
| author |   jakob <jakob@openbsd.org> | 2007-01-10 19:07:58 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2007-01-10 19:07:58 +0000 |
| commit | 066afc0f0bac2b49cf3c9398ee16fa8b817bf3e2 (patch) | |
| tree | 9594cbcc476818c35b9f22346cca54c165a8a7a6 /usr.sbin/bind/lib/isc/unix/ifiter_ioctl.c | |
| parent | ISC BIND release 9.3.3 (diff) | |
| download | wireguard-openbsd-066afc0f0bac2b49cf3c9398ee16fa8b817bf3e2.tar.xz wireguard-openbsd-066afc0f0bac2b49cf3c9398ee16fa8b817bf3e2.zip | |
resolve conflicts and regen configure script
Diffstat (limited to 'usr.sbin/bind/lib/isc/unix/ifiter_ioctl.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/ifiter_ioctl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/bind/lib/isc/unix/ifiter_ioctl.c b/usr.sbin/bind/lib/isc/unix/ifiter_ioctl.c index 8c418fb42df..0053d015828 100644 --- a/usr.sbin/bind/lib/isc/unix/ifiter_ioctl.c +++ b/usr.sbin/bind/lib/isc/unix/ifiter_ioctl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: ifiter_ioctl.c,v 1.19.2.5.2.17 2005/10/14 02:13:07 marka Exp $ */ +/* $ISC: ifiter_ioctl.c,v 1.19.2.5.2.19 2006/02/03 23:51:37 marka Exp $ */ /* * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl. @@ -529,7 +529,8 @@ internal_current4(isc_interfaceiter_t *iter) { #endif REQUIRE(VALID_IFITER(iter)); - REQUIRE (iter->pos < (unsigned int) iter->ifc.ifc_len); + REQUIRE(iter->ifc.ifc_len == 0 || + iter->pos < (unsigned int) iter->ifc.ifc_len); #ifdef __linux result = linux_if_inet6_current(iter); @@ -538,6 +539,9 @@ internal_current4(isc_interfaceiter_t *iter) { iter->first = ISC_TRUE; #endif + if (iter->ifc.ifc_len == 0) + return (ISC_R_NOMORE); + ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos); memset(&ifreq, 0, sizeof(ifreq)); |