Fix some more build errors

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8974 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-10 18:51:01 +00:00
parent 5e7cfa0f03
commit d6bfd90065
2 changed files with 8 additions and 65 deletions

View File

@ -1,5 +1,5 @@
###############################################################################
# /etc/shorewall/shorewall.conf Version 4 - Change the following variables to
# /etc/shorewalls/shorewall6.conf Version 4 - Change the following variables to
# match your setup
#
# This program is under GPL
@ -26,13 +26,6 @@ STARTUP_ENABLED=No
VERBOSITY=1
###############################################################################
# C O M P I L E R
# (setting this to 'perl' requires installation of Shorewall-perl)
###############################################################################
SHOREWALL_COMPILER=
###############################################################################
# L O G G I N G
###############################################################################
@ -55,21 +48,13 @@ LOGALLNEW=
BLACKLIST_LOGLEVEL=
MACLIST_LOG_LEVEL=info
TCP_FLAGS_LOG_LEVEL=info
RFC1918_LOG_LEVEL=info
SMURF_LOG_LEVEL=info
LOG_MARTIANS=Yes
###############################################################################
# L O C A T I O N O F F I L E S A N D D I R E C T O R I E S
###############################################################################
IPTABLES=
IP6TABLES=
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
@ -79,12 +64,10 @@ SUBSYSLOCK=/var/lock/subsys/shorewall
MODULESDIR=
CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
CONFIG_PATH=/etc/shorewall6:/usr/share/shorewall6
RESTOREFILE=
IPSECFILE=zones
LOCKFILE=
###############################################################################
@ -108,67 +91,31 @@ RCP_COMMAND='scp ${files} ${root}@${system}:${destination}'
# F I R E W A L L O P T I O N S
###############################################################################
IP_FORWARDING=On
ADD_IP_ALIASES=Yes
ADD_SNAT_ALIASES=No
RETAIN_ALIASES=No
TC_ENABLED=Internal
TC_ENABLED=No
TC_EXPERT=No
CLEAR_TC=Yes
CLEAR_TC=No
MARK_IN_FORWARD_CHAIN=No
CLAMPMSS=No
ROUTE_FILTER=No
DETECT_DNAT_IPADDRS=No
MUTEX_TIMEOUT=60
ADMINISABSENTMINDED=Yes
BLACKLISTNEWONLY=Yes
DELAYBLACKLISTLOAD=No
MODULE_SUFFIX=
DISABLE_IPV6=Yes
IPV6=Off
BRIDGING=No
DYNAMIC_ZONES=No
PKTTYPE=Yes
RFC1918_STRICT=No
MACLIST_TABLE=filter
MACLIST_TTL=
SAVE_IPSETS=No
MAPOLDACTIONS=No
FASTACCEPT=No
IMPLICIT_CONTINUE=No
HIGH_ROUTE_MARKS=No
USE_ACTIONS=Yes
OPTIMIZE=0
OPTIMIZE=1
EXPORTPARAMS=Yes
@ -178,15 +125,13 @@ KEEP_RT_TABLES=No
DELETE_THEN_ADD=Yes
MULTICAST=No
DONT_LOAD=
AUTO_COMMENT=Yes
MANGLE_ENABLED=Yes
USE_DEFAULT_RT=No
USE_DEFAULT_RT=Yes
###############################################################################
# P A C K E T D I S P O S I T I O N
@ -194,8 +139,6 @@ USE_DEFAULT_RT=No
BLACKLIST_DISPOSITION=DROP
MACLIST_DISPOSITION=REJECT
TCP_FLAGS_DISPOSITION=DROP
#LAST LINE -- DO NOT REMOVE

View File

@ -425,7 +425,7 @@ case $VERSION in
# Normal Release
#
RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
RPM6NAME=shorewall-common-${VERSION}-0base.noarch.rpm
RPM6NAME=shorewall6-${VERSION}-0base.noarch.rpm
LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
LITE6RPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm