svn commit: r271972 - head/contrib/ipfilter/lib

[Cy Schubert]

Author: cy
Date: Mon Sep 22 16:09:18 2014
New Revision: 271972
URL: http://svnweb.freebsd.org/changeset/base/271972

Log:
  #536 ipnat can try to print rule as dstlist incorrectly
  
  Approved by:	glebius (mentor)
  Obtained from:	ipfilter CVS repo (r1.14), netbsd CVS repo (r1.3)

Modified:
  head/contrib/ipfilter/lib/printnat.c

Modified: head/contrib/ipfilter/lib/printnat.c
==============================================================================
--- head/contrib/ipfilter/lib/printnat.c	Mon Sep 22 16:06:37 2014	(r271971)
+++ head/contrib/ipfilter/lib/printnat.c	Mon Sep 22 16:09:18 2014	(r271972)
@@ -153,7 +153,8 @@ printnat(np, opts)
 
 	} else if (np->in_redir & NAT_REWRITE) {
 		PRINTF(" -> src ");
-		if (np->in_nsrc.na_type == IPLT_DSTLIST) {
+		if (np->in_nsrc.na_atype == FRI_LOOKUP &&
+		    np->in_nsrc.na_type == IPLT_DSTLIST) {
 			PRINTF("dstlist/");
 			if (np->in_nsrc.na_subtype == 0)
 				PRINTF("%d", np->in_nsrc.na_num);
@@ -174,7 +175,8 @@ printnat(np, opts)
 			}
 		}
 		PRINTF(" dst ");
-		if (np->in_ndst.na_type == IPLT_DSTLIST) {
+		if (np->in_ndst.na_atype == FRI_LOOKUP &&
+		    np->in_ndst.na_type == IPLT_DSTLIST) {
 			PRINTF("dstlist/");
 			if (np->in_ndst.na_subtype == 0)
 				PRINTF("%d", np->in_nsrc.na_num);