svn commit: r228053 - stable/8/sbin/ipfw

[Gleb Smirnoff]

Author: glebius
Date: Mon Nov 28 08:16:00 2011
New Revision: 228053
URL: http://svn.freebsd.org/changeset/base/228053

Log:
  MFhead r227901:
  
    Fix parsing of redirect_addr argument.
    PR:	kern/162739

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

Modified: stable/8/sbin/ipfw/nat.c
==============================================================================
--- stable/8/sbin/ipfw/nat.c	Mon Nov 28 08:14:59 2011	(r228052)
+++ stable/8/sbin/ipfw/nat.c	Mon Nov 28 08:16:00 2011	(r228053)
@@ -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);