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

clean up STATEDIR handling in the compiler

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3351 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-22 23:50:24 +00:00
parent 2d5d02662a
commit af7e04f0b0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall/compiler
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.2 # The Shoreline Firewall (Shorewall) Packet Filtering Firewall Compiler - V3.2
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #
@ -31,7 +31,8 @@
# #
# Commands are: # Commands are:
# #
# shorewall check Verify the configuration files. # compile check Verify the configuration files.
# compile compile <path name> Compile into <path name>
# #
# Mutual exclusion -- These functions are jackets for the mutual exclusion # Mutual exclusion -- These functions are jackets for the mutual exclusion
# routines in $FUNCTIONS. They invoke # routines in $FUNCTIONS. They invoke
@ -43,10 +44,8 @@
# Fatal error -- stops the firewall after issuing the error message # Fatal error -- stops the firewall after issuing the error message
# #
fatal_error() # $* = Error Message fatal_error() # $* = Error Message
{ { echo " ERROR: $@" >&2
echo " ERROR: $@" >&2
[ -n "$TMP_DIR" ] && rm -rf $TMP_DIR [ -n "$TMP_DIR" ] && rm -rf $TMP_DIR
[ -n "$TMP_DIR1" ] && rm -rf $TMP_DIR1
[ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE [ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE
exit 2 exit 2
} }
@ -59,7 +58,6 @@ startup_error() # $* = Error Message
{ {
echo " ERROR: $@" >&2 echo " ERROR: $@" >&2
[ -n "$TMP_DIR" ] && rm -rf $TMP_DIR [ -n "$TMP_DIR" ] && rm -rf $TMP_DIR
[ -n "$TMP_DIR1" ] && rm -rf $TMP_DIR1
[ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE [ -n "$RESTOREBASE" ] && rm -f $RESTOREBASE
kill $$ kill $$
exit 2 exit 2
@ -8343,8 +8341,6 @@ compile_firewall() # $1 = File Name
STATEDIR=$(mktempdir) STATEDIR=$(mktempdir)
TMP_DIR1=$STATEDIR
[ -n "$RESTOREBASE" ] || startup_error "Cannot create temporary file in /tmp" [ -n "$RESTOREBASE" ] || startup_error "Cannot create temporary file in /tmp"
[ -z "$PROGRAM" ] && save_command "#! $SHOREWALL_SHELL --" [ -z "$PROGRAM" ] && save_command "#! $SHOREWALL_SHELL --"
@ -8619,11 +8615,10 @@ __EOF__
fi fi
rm -rf $TMP_DIR rm -rf $TMP_DIR
rm -rf $TMP_DIR1 rm -rf $STATEDIR
} }
# #
# Determine the value for a parameter that defaults to Yes # Determine the value for a parameter that defaults to Yes
# #