From d5430a83c6df98bbf87b5135a67500401880ff5b Mon Sep 17 00:00:00 2001 From: glebius Date: Wed, 6 Nov 2013 19:47:23 +0000 Subject: [PATCH] Merge r227738, r228574: Fill in sin_family in ioctl() arguments. git-svn-id: svn://svn.freebsd.org/base/stable/9@257762 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sbin/ifconfig/af_inet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index 19e27c90a..b410307bb 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -104,8 +104,7 @@ in_getaddr(const char *s, int which) struct netent *np; sin->sin_len = sizeof(*sin); - if (which != MASK) - sin->sin_family = AF_INET; + sin->sin_family = AF_INET; if (which == ADDR) { char *p = NULL; @@ -124,6 +123,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); -- 2.45.0