From owner-p4-projects@FreeBSD.ORG  Wed Sep  6 08:32:33 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38F6216A4E2; Wed,  6 Sep 2006 08:32:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1592D16A4E0
	for <perforce@freebsd.org>; Wed,  6 Sep 2006 08:32:33 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D5ACC43D4C
	for <perforce@freebsd.org>; Wed,  6 Sep 2006 08:32:32 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k868WWh5076825
	for <perforce@freebsd.org>; Wed, 6 Sep 2006 08:32:32 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k868WWvp076822
	for perforce@freebsd.org; Wed, 6 Sep 2006 08:32:32 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 6 Sep 2006 08:32:32 GMT
Message-Id: <200609060832.k868WWvp076822@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 105718 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: Wed, 06 Sep 2006 08:32:33 -0000

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

Change 105718 by piso@piso_longino on 2006/09/06 08:32:11

	Rename libalias TOK_LOG to TOK_ALOG to avoid clashing
	with ALTQ TOK_LOG.

Affected files ...

.. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#7 edit

Differences ...

==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#7 (text+ko) ====

@@ -315,7 +315,7 @@
 	TOK_WEIGHT,
 	TOK_IP,
 	TOK_IF,
- 	TOK_LOG,
+ 	TOK_ALOG,
  	TOK_DENY_INC,
  	TOK_SAME_PORTS,
  	TOK_UNREG_ONLY,
@@ -370,7 +370,7 @@
 struct _s_x nat_params[] = {
 	{ "ip",	                TOK_IP },
 	{ "if",	                TOK_IF },
- 	{ "log",                TOK_LOG },
+ 	{ "log",                TOK_ALOG },
  	{ "deny_in",	        TOK_DENY_INC },
  	{ "same_ports",	        TOK_SAME_PORTS },
  	{ "unreg_only",	        TOK_UNREG_ONLY },
@@ -3923,7 +3923,7 @@
 	    ac--; av++;
 	    break;
 
-	  case TOK_LOG:
+	  case TOK_ALOG:
 	    n->mode |= PKT_ALIAS_LOG;
 	    break;