diff options
| author |   angelos <angelos@openbsd.org> | 1998-03-20 03:06:51 +0000 |
|---|---|---|
| committer | angelos <angelos@openbsd.org> | 1998-03-20 03:06:51 +0000 |
| commit | 3d48419a6b5e033e91d4a7cc5a59eb12f90be44c (patch) | |
| tree | d5a01dda62765def7517af434de31c797dd3563c | |
| parent | Cleaner handling. (diff) | |
| download | wireguard-openbsd-3d48419a6b5e033e91d4a7cc5a59eb12f90be44c.tar.xz wireguard-openbsd-3d48419a6b5e033e91d4a7cc5a59eb12f90be44c.zip | |
Aliases...
| -rw-r--r-- | usr.sbin/named/named/ns_main.c | 6 | ||||
| -rw-r--r-- | usr.sbin/pppd/sys-bsd.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/named/named/ns_main.c b/usr.sbin/named/named/ns_main.c index 5ad5c179764..179cfc01150 100644 --- a/usr.sbin/named/named/ns_main.c +++ b/usr.sbin/named/named/ns_main.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_main.c,v 1.7 1997/04/27 23:09:44 deraadt Exp $ */ +/* $OpenBSD: ns_main.c,v 1.8 1998/03/20 03:06:51 angelos Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_main.c 4.55 (Berkeley) 7/1/91"; static char rcsid[] = "$From: ns_main.c,v 8.24 1996/11/26 10:11:22 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_main.c,v 1.7 1997/04/27 23:09:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ns_main.c,v 1.8 1998/03/20 03:06:51 angelos Exp $"; #endif #endif /* not lint */ @@ -1109,6 +1109,8 @@ getnetconf() } continue; } else if ((ifreq.ifr_flags & IFF_POINTOPOINT)) { + ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr = + ntp->my_addr; if (ioctl(vs, SIOCGIFDSTADDR, (char *)&ifreq) < 0) { syslog(LOG_NOTICE, "get dst addr: %m"); continue; diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c index bc02bff9b32..a93a77f722d 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.12 1998/01/17 20:30:29 millert Exp $ */ +/* $OpenBSD: sys-bsd.c,v 1.13 1998/03/20 03:10:03 angelos Exp $ */ /* * sys-bsd.c - System-dependent procedures for setting up @@ -26,7 +26,7 @@ #if 0 static char rcsid[] = "Id: sys-bsd.c,v 1.29 1997/11/27 06:10:04 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.12 1998/01/17 20:30:29 millert Exp $"; +static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.13 1998/03/20 03:10:03 angelos Exp $"; #endif #endif @@ -1415,6 +1415,7 @@ get_ether_addr(ipaddr, hwaddr) /* * Get its netmask and check that it's on the right subnet. */ + ifreq.ifr_addr = ifr->ifr_addr; if (ioctl(sockfd, SIOCGIFNETMASK, &ifreq) < 0) continue; mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr; @@ -1510,6 +1511,7 @@ GetMask(addr) /* * Get its netmask and OR it into our mask. */ + ifreq.ifr_addr = ifr->ifr_addr; if (ioctl(sockfd, SIOCGIFNETMASK, &ifreq) < 0) continue; mask |= ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr.s_addr; |