From owner-p4-projects@FreeBSD.ORG  Sat Oct 11 05:08:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 604B71065688; Sat, 11 Oct 2008 05:08:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F82B1065691
	for <perforce@freebsd.org>; Sat, 11 Oct 2008 05:08:43 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EAA238FC18
	for <perforce@freebsd.org>; Sat, 11 Oct 2008 05:08:42 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9B58gJK092494
	for <perforce@freebsd.org>; Sat, 11 Oct 2008 05:08:42 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9B58gf8092492
	for perforce@freebsd.org; Sat, 11 Oct 2008 05:08:42 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 11 Oct 2008 05:08:42 GMT
Message-Id: <200810110508.m9B58gf8092492@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151251 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Oct 2008 05:08:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=151251

Change 151251 by sam@sam_ebb on 2008/10/11 05:07:57

	fix merge botch

Affected files ...

.. //depot/projects/vap/sbin/ifconfig/regdomain.c#9 edit

Differences ...

==== //depot/projects/vap/sbin/ifconfig/regdomain.c#9 (text+ko) ====

@@ -401,7 +401,7 @@
 	struct freqband *fp;
 	struct netband *nb;
 	const void *id;
-	int i;
+	int i, errors;
 
 	memset(rdp, 0, sizeof(struct regdata));
 	mt = calloc(1, sizeof(struct mystate));