diff options
| -rw-r--r-- | sbin/ifconfig/af_inet.c | 1 | ||||
| -rw-r--r-- | sys/netinet/in.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index bcd17c4..c733373 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -126,6 +126,7 @@ in_getaddr(const char *s, int which) *p = '/'; errx(1, "%s: bad value (width %s)", s, errstr); } + min->sin_family = AF_INET; min->sin_len = sizeof(*min); min->sin_addr.s_addr = htonl(~((1LL << (32 - masklen)) - 1) & 0xffffffff); diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 7e9b1ed..e0b3efa 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -253,16 +253,10 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, sizeof(struct sockaddr_in) || ifra->ifra_broadaddr.sin_family != AF_INET)) return (EINVAL); -#if 0 - /* - * ifconfig(8) historically doesn't set af_family for mask - * for unknown reason. - */ if (ifra->ifra_mask.sin_len != 0 && (ifra->ifra_mask.sin_len != sizeof(struct sockaddr_in) || ifra->ifra_mask.sin_family != AF_INET)) return (EINVAL); -#endif break; case SIOCSIFADDR: case SIOCSIFBRDADDR: |
