From owner-svn-src-all@FreeBSD.ORG Fri Mar 20 13:46:31 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA0361065673; Fri, 20 Mar 2009 13:46:30 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CCB3D8FC1D; Fri, 20 Mar 2009 13:46:30 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2KDkUC6003970; Fri, 20 Mar 2009 13:46:30 GMT (envelope-from jamie@svn.freebsd.org) Received: (from jamie@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2KDkUgJ003967; Fri, 20 Mar 2009 13:46:30 GMT (envelope-from jamie@svn.freebsd.org) Message-Id: <200903201346.n2KDkUgJ003967@svn.freebsd.org> From: Jamie Gritton Date: Fri, 20 Mar 2009 13:46:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190154 - stable/7/sbin/ifconfig X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Mar 2009 13:46:32 -0000 Author: jamie Date: Fri Mar 20 13:46:30 2009 New Revision: 190154 URL: http://svn.freebsd.org/changeset/base/190154 Log: Revert r189970 until its implications get sorted out in CURRENT. Approved by: bz(mentor) Modified: stable/7/sbin/ifconfig/ (props changed) stable/7/sbin/ifconfig/ifclone.c stable/7/sbin/ifconfig/ifconfig.c stable/7/sbin/ifconfig/ifgroup.c Modified: stable/7/sbin/ifconfig/ifclone.c ============================================================================== --- stable/7/sbin/ifconfig/ifclone.c Fri Mar 20 13:44:43 2009 (r190153) +++ stable/7/sbin/ifconfig/ifclone.c Fri Mar 20 13:46:30 2009 (r190154) @@ -53,9 +53,9 @@ list_cloners(void) int idx; int s; - s = socket(AF_LOCAL, SOCK_DGRAM, 0); + s = socket(AF_INET, SOCK_DGRAM, 0); if (s == -1) - err(1, "socket(AF_LOCAL,SOCK_DGRAM)"); + err(1, "socket(AF_INET,SOCK_DGRAM)"); memset(&ifcr, 0, sizeof(ifcr)); Modified: stable/7/sbin/ifconfig/ifconfig.c ============================================================================== --- stable/7/sbin/ifconfig/ifconfig.c Fri Mar 20 13:44:43 2009 (r190153) +++ stable/7/sbin/ifconfig/ifconfig.c Fri Mar 20 13:46:30 2009 (r190154) @@ -434,22 +434,21 @@ static const struct cmd setifdstaddr_cmd DEF_CMD("ifdstaddr", 0, setifdstaddr); static int -ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *uafp) +ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *afp) { - const struct afswtch *afp, *nafp; + const struct afswtch *nafp; struct callback *cb; int s; strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); - afp = uafp != NULL ? uafp : af_getbyname("inet"); top: + if (afp == NULL) + afp = af_getbyname("inet"); ifr.ifr_addr.sa_family = afp->af_af == AF_LINK || afp->af_af == AF_UNSPEC ? - AF_LOCAL : afp->af_af; + AF_INET : afp->af_af; - if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0 && - (uafp != NULL || errno != EPROTONOSUPPORT || - (s = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0)) + if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family); while (argc > 0) { @@ -793,12 +792,11 @@ status(const struct afswtch *afp, const if (afp == NULL) { allfamilies = 1; - ifr.ifr_addr.sa_family = AF_LOCAL; - } else { + afp = af_getbyname("inet"); + } else allfamilies = 0; - ifr.ifr_addr.sa_family = - afp->af_af == AF_LINK ? AF_LOCAL : afp->af_af; - } + + ifr.ifr_addr.sa_family = afp->af_af == AF_LINK ? AF_INET : afp->af_af; strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0); Modified: stable/7/sbin/ifconfig/ifgroup.c ============================================================================== --- stable/7/sbin/ifconfig/ifgroup.c Fri Mar 20 13:44:43 2009 (r190153) +++ stable/7/sbin/ifconfig/ifgroup.c Fri Mar 20 13:46:30 2009 (r190154) @@ -131,9 +131,9 @@ printgroup(const char *groupname) int len, cnt = 0; int s; - s = socket(AF_LOCAL, SOCK_DGRAM, 0); + s = socket(AF_INET, SOCK_DGRAM, 0); if (s == -1) - err(1, "socket(AF_LOCAL,SOCK_DGRAM)"); + err(1, "socket(AF_INET,SOCK_DGRAM)"); bzero(&ifgr, sizeof(ifgr)); strlcpy(ifgr.ifgr_name, groupname, sizeof(ifgr.ifgr_name)); if (ioctl(s, SIOCGIFGMEMB, (caddr_t)&ifgr) == -1) {