From owner-svn-src-all@FreeBSD.ORG  Mon Nov 28 08:12:38 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 39B66106566B;
	Mon, 28 Nov 2011 08:12:38 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2869E8FC17;
	Mon, 28 Nov 2011 08:12:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAS8CcZ3080463;
	Mon, 28 Nov 2011 08:12:38 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAS8CcaJ080461;
	Mon, 28 Nov 2011 08:12:38 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201111280812.pAS8CcaJ080461@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 28 Nov 2011 08:12:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228051 - stable/9/sbin/ipfw
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 08:12:38 -0000

Author: glebius
Date: Mon Nov 28 08:12:37 2011
New Revision: 228051
URL: http://svn.freebsd.org/changeset/base/228051

Log:
  MFhead r227901:
  
    Fix parsing of redirect_addr argument.
  
    PR:	kern/162739
  
  Approved by:	re (kib)

Modified:
  stable/9/sbin/ipfw/nat.c
Directory Properties:
  stable/9/sbin/ipfw/   (props changed)

Modified: stable/9/sbin/ipfw/nat.c
==============================================================================
--- stable/9/sbin/ipfw/nat.c	Mon Nov 28 08:10:12 2011	(r228050)
+++ stable/9/sbin/ipfw/nat.c	Mon Nov 28 08:12:37 2011	(r228051)
@@ -345,11 +345,12 @@ setup_redir_addr(char *buf, int *ac, cha
 	space = sizeof(struct cfg_redir);
 
 	/* Extract local address. */
-	if ((sep = strtok(**av, ",")) != NULL) {
+	if (strchr(**av, ',') != NULL) {
 		struct cfg_spool *spool;
 
 		/* Setup LSNAT server pool. */
 		r->laddr.s_addr = INADDR_NONE;
+		sep = strtok(**av, ",");
 		while (sep != NULL) {
 			spool = (struct cfg_spool *)buf;
 			space += sizeof(struct cfg_spool);