From owner-svn-src-head@FreeBSD.ORG  Wed Apr 15 20:53:34 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B73191065676;
	Wed, 15 Apr 2009 20:53:34 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A5AA38FC0A;
	Wed, 15 Apr 2009 20:53:34 +0000 (UTC)
	(envelope-from brooks@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 n3FKrYov054454;
	Wed, 15 Apr 2009 20:53:34 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3FKrYAx054453;
	Wed, 15 Apr 2009 20:53:34 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200904152053.n3FKrYAx054453@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 15 Apr 2009 20:53:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191121 - head/sbin/ifconfig
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Apr 2009 20:53:35 -0000

Author: brooks
Date: Wed Apr 15 20:53:34 2009
New Revision: 191121
URL: http://svn.freebsd.org/changeset/base/191121

Log:
  The structs ifaliasreq and in_aliasreq have exactly the same layout and
  member names, but we really do mean to use in_aliasreq here.
  
  MFC after:	1 week

Modified:
  head/sbin/ifconfig/af_inet.c

Modified: head/sbin/ifconfig/af_inet.c
==============================================================================
--- head/sbin/ifconfig/af_inet.c	Wed Apr 15 20:49:59 2009	(r191120)
+++ head/sbin/ifconfig/af_inet.c	Wed Apr 15 20:53:34 2009	(r191121)
@@ -52,7 +52,7 @@ static const char rcsid[] =
 
 #include "ifconfig.h"
 
-static struct ifaliasreq in_addreq;
+static struct in_aliasreq in_addreq;
 static struct ifreq in_ridreq;
 
 static void
@@ -169,7 +169,7 @@ in_status_tunnel(int s)
 static void
 in_set_tunnel(int s, struct addrinfo *srcres, struct addrinfo *dstres)
 {
-	struct ifaliasreq addreq;
+	struct in_aliasreq addreq;
 
 	memset(&addreq, 0, sizeof(addreq));
 	strncpy(addreq.ifra_name, name, IFNAMSIZ);