svn commit: r266680 - stable/9/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Mon May 26 08:22:34 2014
New Revision: 266680
URL: http://svnweb.freebsd.org/changeset/base/266680

Log:
  MFC r266399:
    Since ipfw nat configures all options in one step, we should set all bits
    in the mask when calling LibAliasSetMode() to properly clear unneeded
    options.
  
    PR:		189655
  Approved by:	re (marius)

Modified:
  stable/9/sys/netpfil/ipfw/ip_fw_nat.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/netpfil/   (props changed)

Modified: stable/9/sys/netpfil/ipfw/ip_fw_nat.c
==============================================================================
--- stable/9/sys/netpfil/ipfw/ip_fw_nat.c	Mon May 26 07:04:30 2014	(r266679)
+++ stable/9/sys/netpfil/ipfw/ip_fw_nat.c	Mon May 26 08:22:34 2014	(r266680)
@@ -442,7 +442,7 @@ ipfw_nat_cfg(struct sockopt *sopt)
 	ptr->ip = cfg->ip;
 	ptr->redir_cnt = cfg->redir_cnt;
 	ptr->mode = cfg->mode;
-	LibAliasSetMode(ptr->lib, cfg->mode, cfg->mode);
+	LibAliasSetMode(ptr->lib, cfg->mode, ~0);
 	LibAliasSetAddress(ptr->lib, ptr->ip);
 	memcpy(ptr->if_name, cfg->if_name, IF_NAMESIZE);