extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 17:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Load IPv6 libraries when processing /etc/shorewall6/params

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-05-30 13:24:36 -07:00
parent 2dec3a8ecb
commit d89a915f26
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Config.pm
View File

@ -2941,7 +2941,7 @@ sub get_params() {
if ( -f $fn ) { if ( -f $fn ) {
progress_message2 "Processing $fn ..."; progress_message2 "Processing $fn ...";
my $command = "$FindBin::Bin/getparams $fn " . join( ':', @config_path ); my $command = "$FindBin::Bin/getparams $fn " . join( ':', @config_path ) . " $family";
# #
# getparams silently sources the params file under 'set -a', then executes 'export -p' # getparams silently sources the params file under 'set -a', then executes 'export -p'
# #

5
Shorewall/Perl/getparams
View File

@ -21,8 +21,13 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
if [ "$3" = 6 ]; then
. /usr/share/shorewall6/lib.base
. /usr/share/shorewall6/lib.cli
else
. /usr/share/shorewall/lib.base . /usr/share/shorewall/lib.base
. /usr/share/shorewall/lib.cli . /usr/share/shorewall/lib.cli
fi
CONFIG_PATH="$2" CONFIG_PATH="$2"

2
Shorewall/changelog.txt
View File

@ -6,6 +6,8 @@ Changes in Shorewall 4.4.20 RC 1
3) Don't place negative numbers in IPMARK masks. 3) Don't place negative numbers in IPMARK masks.
4) Fix IPv6 getparams
Changes in Shorewall 4.4.20 Beta 5 Changes in Shorewall 4.4.20 Beta 5
1) Rename Auditing Macros 1) Rename Auditing Macros

5
Shorewall/releasenotes.txt
View File

@ -77,6 +77,11 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
are specified for IPMARK mask values. Shorewall now converts such are specified for IPMARK mask values. Shorewall now converts such
numbers to their 32-bit hex equivalent. numbers to their 32-bit hex equivalent.
5) Previously, before /etc/shorewall6/params was processed, the
IPv4 Shorewall libraries (/usr/share/shorewall/lib.*) were
loaded rather that the IPv6 versions (/usr/share/shorewall6/lib.*).
Now, the correct libraries are loaded.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
I I. K N O W N P R O B L E M S R E M A I N I N G I I. K N O W N P R O B L E M S R E M A I N I N G
---------------------------------------------------------------------------- ----------------------------------------------------------------------------