svn commit: r336164 - stable/11/sbin/pfctl

[Kristof Provost]

Author: kp
Date: Tue Jul 10 07:29:51 2018
New Revision: 336164
URL: https://svnweb.freebsd.org/changeset/base/336164

Log:
  MFC r335886:
  
  pfctl: Don't retrieve interface list if '-n' is set
  
  If '-n' is set we don't use the list of skip interfaces, so don't retrieve it.
  This fixes issues if 'pfctl -n' is used before the pf module is loaded. This
  was broken by r333181.
  
  Reported by:	Jakub Chromy <hicks AT cgi.cz>

Modified:
  stable/11/sbin/pfctl/pfctl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/pfctl/pfctl.c
==============================================================================
--- stable/11/sbin/pfctl/pfctl.c	Tue Jul 10 06:09:25 2018	(r336163)
+++ stable/11/sbin/pfctl/pfctl.c	Tue Jul 10 07:29:51 2018	(r336164)
@@ -2407,7 +2407,7 @@ main(int argc, char *argv[])
 	}
 
 	if ((rulesopt != NULL) && (loadopt & PFCTL_FLAG_OPTION) &&
-	    !anchorname[0])
+	    !anchorname[0] && !(opts & PF_OPT_NOACTION))
 		if (pfctl_get_skip_ifaces())
 			error = 1;