holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Change output from 'compile' to the entered name in all cases (do not append /var/lib/shorewall)

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3276 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-13 17:08:23 +00:00
parent b5dbeb1ead
commit 222fb2c10f
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/changelog.txt
View File

@ -9,3 +9,6 @@ Changes in 3.1.0
4) Add back dynamic zones. 4) Add back dynamic zones.
5) Allow remote compiles. 5) Allow remote compiles.
6) Change output of 'generate' to always be the file name entered (do not
prepend /var/lib/shorewall/)

18
Shorewall/firewall
View File

@ -1308,7 +1308,7 @@ verify_mark() # $1 = value to test
# #
setup_providers() setup_providers()
{ {
local table number mark duplicate interface gateway options provider address copy route loose addresses rulenum pref echobin=$(mywhich echo) local table number mark duplicate interface gateway options provider address copy route loose addresses rulenum pref echobin=$(mywhich echo) balance
copy_table() { copy_table() {
if [ $COMMAND = generate ]; then if [ $COMMAND = generate ]; then
@ -1459,6 +1459,7 @@ __EOF__
ROUTEMARK_INTERFACES="$ROUTEMARK_INTERFACES $interface" ROUTEMARK_INTERFACES="$ROUTEMARK_INTERFACES $interface"
;; ;;
balance=*) balance=*)
balance=yes
if [ $COMMAND = generate ]; then if [ $COMMAND = generate ]; then
save_command " DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via \$gateway dev $interface weight ${option#*=}\"" save_command " DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via \$gateway dev $interface weight ${option#*=}\""
else else
@ -1466,6 +1467,7 @@ __EOF__
fi fi
;; ;;
balance) balance)
balance=yes
if [ $COMMAND = generate ]; then if [ $COMMAND = generate ]; then
save_command " DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via \$gateway dev $interface weight 1\"" save_command " DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via \$gateway dev $interface weight 1\""
else else
@ -1527,6 +1529,7 @@ __EOF__
if [ -s $TMP_DIR/providers ]; then if [ -s $TMP_DIR/providers ]; then
DEFAULT_ROUTE= DEFAULT_ROUTE=
balance=
if [ $COMMAND != check ]; then if [ $COMMAND != check ]; then
progress_message2 "Processing $1..." progress_message2 "Processing $1..."
@ -1556,8 +1559,10 @@ __EOF__
if [ -n "$PROVIDERS" ]; then if [ -n "$PROVIDERS" ]; then
case $COMMAND in case $COMMAND in
generate) generate)
save_command " [ -n \"\$DEFAULT_ROUTE\" ] && ip route replace default scope global \$DEFAULT_ROUTE" if [ -n "$balance" ]; then
save_command " ip route replace default scope global \$DEFAULT_ROUTE"
save_command " progress_message Default route \$DEFAULT_ROUTE Added" save_command " progress_message Default route \$DEFAULT_ROUTE Added"
fi
;; ;;
*) *)
if [ -n "$DEFAULT_ROUTE" ]; then if [ -n "$DEFAULT_ROUTE" ]; then
@ -8972,19 +8977,10 @@ compile_firewall() # $1 = File Name
[ -d /var/lib/shorewall ] || { mkdir -p /var/lib/shorewall ; chmod 700 /var/lib/shorewall; } [ -d /var/lib/shorewall ] || { mkdir -p /var/lib/shorewall ; chmod 700 /var/lib/shorewall; }
case $outfile in
*/*)
[ -d $dir ] || startup_error "Directory $dir does not exist" [ -d $dir ] || startup_error "Directory $dir does not exist"
[ -h $dir ] && startup_error "$dir is a Symbolic Link" [ -h $dir ] && startup_error "$dir is a Symbolic Link"
[ -d $outfile ] && startup_error "$outfile is a Directory" [ -d $outfile ] && startup_error "$outfile is a Directory"
[ -h $outfile ] && startup_error "$outfile is a Symbolic Link" [ -h $outfile ] && startup_error "$outfile is a Symbolic Link"
;;
*)
outfile=/var/lib/shorewall/$1
;;
esac
[ -f $outfile -a ! -x $outfile ] && startup_error "$outfile exists and is not a restore file" [ -f $outfile -a ! -x $outfile ] && startup_error "$outfile exists and is not a restore file"
RESTOREBASE=$(mktempfile /var/lib/shorewall) RESTOREBASE=$(mktempfile /var/lib/shorewall)

8
Shorewall/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 3.1.1 Shorewall 3.1.2
Note to users upgrading from Shorewall 2.x or 3.0 Note to users upgrading from Shorewall 2.x or 3.0
@ -52,9 +52,7 @@ New Features:
<config directory> Is an optional directory to be searched for <config directory> Is an optional directory to be searched for
configuration files prior to those listed configuration files prior to those listed
in CONFIG_DIR in /etc/shorewall/shorewall.conf. in CONFIG_DIR in /etc/shorewall/shorewall.conf.
<script file> Is the name of the output file. If a simple <script file> Is the name of the output file.
filename is given, the file will be created in
/var/lib/shorewall.
The 'generate' command processes the configuration and writes a script file The 'generate' command processes the configuration and writes a script file
which may then be executed (either directly or using the 'shorewall restore' which may then be executed (either directly or using the 'shorewall restore'
@ -100,7 +98,7 @@ New Features:
The 'reload' command creates a script using 'generate' and if there are The 'reload' command creates a script using 'generate' and if there are
no errors, it then restores that script. It is equivalent to: no errors, it then restores that script. It is equivalent to:
if shorewall generate .reload; then restore .reload; fi if shorewall generate /var/lib/shorewall/.reload; then restore .reload; fi
The advantage of using reload over restart is that reload results in new The advantage of using reload over restart is that reload results in new
connections being dropped for a much shorter time. Here are the results of connections being dropped for a much shorter time. Here are the results of

2
Shorewall/shorewall
View File

@ -928,7 +928,7 @@ case "$1" in
export NOROUTES export NOROUTES
if $SHOREWALL_SHELL $FIREWALL $debugging $nolock compile .reload; then if $SHOREWALL_SHELL $FIREWALL $debugging $nolock compile /var/lib/shorewall/.reload; then
$0 $(make_quiet) restore .reload $0 $(make_quiet) restore .reload
fi fi
;; ;;