diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 799af68be..173532ea7 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -2,6 +2,8 @@ Changes in 3.4.0 Beta 2 1) Fix for empty blacklist file. +2) Don't copy files from /usr/share/shorewall into the compiled script. + Changes in 3.4.0 Beta 1 1) Correct handling of masq file. diff --git a/Shorewall/compiler b/Shorewall/compiler index 5b0eadc12..2a59d1e3e 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -117,10 +117,20 @@ append_file() # $1 = File Name { local user_exit=$(find_file $1) - if [ -f $user_exit ]; then - save_progress_message "Processing $user_exit ..." - indent $user_exit >&3 - fi + case $user_exit in + $SHAREDIR/*) + # + # Don't copy files from /usr/share/shorewall into the compiled script + # + ;; + *) + if [ -f $user_exit ]; then + save_progress_message "Processing $user_exit ..." + indent $user_exit >&3 + save_command + fi + ;; + esac } # diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 6d81b56ed..d14bfa14c 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -35,6 +35,11 @@ Problems Corrected in 3.4.0 Beta 2 script contained a syntax error (the function load_blacklist() was empty). +2) If the file /etc/shorewall/init did not exist, then the compiler + would incorrectly copy /usr/share/shorewall/init into the + compiled script. /usr/share/shorewall/init is a symbolic link + to the Shorewall init script (usually /etc/init.d/shorewall). + Migration Considerations: 1) Shorewall supports the notion of "default actions". A default