extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-15 10:51:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct handling of missing common.def file

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@748 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-09-27 14:54:16 +00:00
parent f88241a6f1
commit 2e4f97175d
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/changelog.txt
View File

@ -85,3 +85,6 @@ Changes since 1.4.6
37) Reword error message to avoid the word 'illegal'. 37) Reword error message to avoid the word 'illegal'.
38) Avoid shell error when there is no policy corresponding to a rule. 38) Avoid shell error when there is no policy corresponding to a rule.
39) Fatal error if /etc/shorewall/common or /etc/shoreall/common.def do
not exist.

8
Shorewall/firewall
View File

@ -2851,7 +2851,7 @@ process_rule() # $1 = target
# #
# Process the rules file for the 'start', 'restart' or 'check' command. # Process the rules file for the 'start', 'restart' or 'check' command.
# #
process_rules() # $1 = name of rules file process_rules()
{ {
# #
# Process a rule where the source or destination is "all" # Process a rule where the source or destination is "all"
@ -3925,8 +3925,10 @@ build_common_chain() {
if [ -f $common ]; then if [ -f $common ]; then
. $common . $common
elif [ -f /etc/shorewall/common.def ]; then
. /etc/shorewall/common.def
else else
. `find_file common.def` fatal_error "/etc/shorewall/common.def does not exist"
fi fi
# #
# New Not Syn Stuff # New Not Syn Stuff
@ -4497,7 +4499,7 @@ define_firewall() # $1 = Command (Start or Restart)
echo "Processing $rules..." echo "Processing $rules..."
process_rules $rules process_rules
policy=`find_file policy` policy=`find_file policy`

14
Shorewall/releasenotes.txt
View File

@ -67,6 +67,20 @@ Problems Corrected since version 1.4.6:
No policy defined from zone <source> to zone <dest> No policy defined from zone <source> to zone <dest>
15) Previously, if neither /etc/shorewall/common nor
/etc/shorewall/common.def existed, Shorewall would fail to start
and would not remove the lock file. Failure to remove the lock file
resulted in the following during subsequent attempts to start:
Loading /usr/share/shorewall/functions...
Processing /etc/shorewall/params ...
Processing /etc/shorewall/shorewall.conf...
Giving up on lock file /var/lib/shorewall/lock
Shorewall Not Started
Shorewall now reports a fatal error if neither of these two files
exist and correctly removes the lock file.
Migration Issues: Migration Issues:
1) IP Traffic Accounting is changed from Snapshot 20030813. 1) IP Traffic Accounting is changed from Snapshot 20030813.