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

[John Baldwin]

Author: jhb
Date: Fri Sep 16 19:29:11 2011
New Revision: 225628
URL: http://svn.freebsd.org/changeset/base/225628

Log:
  MFC 224942:
  Fix a regression where a rule containing a source port option after a
  destination IP would incorrectly display the source port as a destination
  port.

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

Modified: stable/8/sbin/ipfw/ipfw2.c
==============================================================================
--- stable/8/sbin/ipfw/ipfw2.c	Fri Sep 16 18:41:19 2011	(r225627)
+++ stable/8/sbin/ipfw/ipfw2.c	Fri Sep 16 19:29:11 2011	(r225628)
@@ -1263,6 +1263,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt
 				HAVE_PROTO | HAVE_SRCIP |
 				HAVE_DSTIP | HAVE_IP, 0);
 		case O_IP_SRCPORT:
+			if (flags & HAVE_DSTIP)
+				flags |= HAVE_IP;
 			show_prerequisites(&flags,
 				HAVE_PROTO | HAVE_SRCIP, 0);
 			if ((cmd->len & F_OR) && !or_block)