Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Jan 2009 10:50:13 +0000 (UTC)
From:      Maxim Konovalov <maxim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r187048 - stable/7/sbin/ipfw
Message-ID:  <200901111050.n0BAoDA2026211@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: maxim
Date: Sun Jan 11 10:50:13 2009
New Revision: 187048
URL: http://svn.freebsd.org/changeset/base/187048

Log:
  Manually merge r183889:183890: do nothing in show_nat() for a test mode (-n).

Modified:
  stable/7/sbin/ipfw/ipfw2.c

Modified: stable/7/sbin/ipfw/ipfw2.c
==============================================================================
--- stable/7/sbin/ipfw/ipfw2.c	Sun Jan 11 08:40:26 2009	(r187047)
+++ stable/7/sbin/ipfw/ipfw2.c	Sun Jan 11 10:50:13 2009	(r187048)
@@ -5983,6 +5983,9 @@ show_nat(int ac, char **av) {
 	lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */
 	ac--; av++;
 
+	if (test_only)
+		return;
+
 	/* Parse parameters. */
 	for (cmd = IP_FW_NAT_GET_LOG, do_cfg = 0; ac != 0; ac--, av++) {
 		if (!strncmp(av[0], "config", strlen(av[0]))) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901111050.n0BAoDA2026211>