svn commit: r339580 - stable/11/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Mon Oct 22 07:04:44 2018
New Revision: 339580
URL: https://svnweb.freebsd.org/changeset/base/339580

Log:
  MFC r339357:
    Add extra parentheses to fix "versrcreach" opcode, (oif != NULL) should
    not be used as condition for ternary operator.
  
    Submitted by:	Tatsuki Makino <tatsuki_makino at hotmail dot com>

Modified:
  stable/11/sys/netpfil/ipfw/ip_fw2.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- stable/11/sys/netpfil/ipfw/ip_fw2.c	Mon Oct 22 06:44:20 2018	(r339579)
+++ stable/11/sys/netpfil/ipfw/ip_fw2.c	Mon Oct 22 07:04:44 2018	(r339580)
@@ -2353,13 +2353,13 @@ do {								\
 
 			case O_VERSRCREACH:
 				/* Outgoing packets automatically pass/match */
-				match = (hlen > 0 && ((oif != NULL) ||
+				match = (hlen > 0 && ((oif != NULL) || (
 #ifdef INET6
 				    is_ipv6 ?
 				        verify_path6(&(args->f_id.src_ip6),
 				            NULL, args->f_id.fib) :
 #endif
-				    verify_path(src_ip, NULL, args->f_id.fib)));
+				    verify_path(src_ip, NULL, args->f_id.fib))));
 				break;
 
 			case O_ANTISPOOF: