From owner-p4-projects@FreeBSD.ORG  Tue Dec 16 22:59:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DEE321065672; Tue, 16 Dec 2008 22:59:44 +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 A3923106564A
	for <perforce@freebsd.org>; Tue, 16 Dec 2008 22:59:44 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 78FEF8FC12
	for <perforce@freebsd.org>; Tue, 16 Dec 2008 22:59:44 +0000 (UTC)
	(envelope-from piso@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 mBGMxiWO049310
	for <perforce@freebsd.org>; Tue, 16 Dec 2008 22:59:44 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGMxi8e049308
	for perforce@freebsd.org; Tue, 16 Dec 2008 22:59:44 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 16 Dec 2008 22:59:44 GMT
Message-Id: <200812162259.mBGMxi8e049308@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154823 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: Tue, 16 Dec 2008 22:59:45 -0000

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

Change 154823 by piso@piso_newluxor on 2008/12/16 22:59:40

	fix a mismerge

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#88 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#88 (text+ko) ====

@@ -1505,7 +1505,6 @@
 			};
 			/* Walk out chain. */		
 			error = find_handler(OUT, IP, la, pip, &ad);
-			error = 0;
 			if (error == 0)
  				iresult = PKT_ALIAS_OK;
  			else