diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 9306cdb5f..d1d60b29c 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -21,3 +21,5 @@ Changes since 1.4.10 10) Restore HAVEROUTE and add PERSISTENT column to the proxy arp file. 11) Install correct init script on Debian. + +12) Get the attention of 'logunclean' and 'dropunclean' users. diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 978946358..ed6f14c33 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -601,6 +601,7 @@ validate_zone() # $1 = zone # validate_interfaces_file() { local wildcard + local found_obsolete_option= while read z interface subnet options; do expandv z interface subnet options @@ -638,6 +639,19 @@ validate_interfaces_file() { case $option in dhcp|norfc1918|tcpflags|newnotsyn|arp_filter|routefilter|blacklist|proxyarp|maclist|nosmurfs|-) ;; + dropunclean|logunclean) + if [ -z "$found_obsolete_option" ]; then + found_obsolete_option=yes + error_message \ + "Warning: The 'dropunclean' and 'logunclean' options are not supported by Shorewall 2.0" + error_message \ + " PLEASE STAND BY WHILE SHOREWALL2 REFORMATS YOUR HARD DRIVE TO REMOVE THESE OPTIONS..." + sleep 5 + error_message "GOTCHA!!!! :-)" + error_message \ + " Now please remove these options from your interfaces file -- Thanks" + fi + ;; detectnets) [ -n "$wildcard" ] && \ startup_error "The \"detectnets\" option may not be used with a wild-card interface"