On Mon, 2011-08-15 at 20:20 +0100, Steven Jan Springl wrote: > After creating a new capabilities file, the following message is produced: > > WARNING: Unknown capability (QUOTA_MATCH) > ignored : /etc/shorewall2/capabilities (line 58)
Steven, I started implementing QUOTA support then thought better of it. The attached patch backs out what got added. Thanks, -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli
index 4789650..30650cb 100644
--- a/Shorewall/lib.cli
+++ b/Shorewall/lib.cli
@@ -1730,7 +1730,6 @@ determine_capabilities() {
HEADER_MATCH=
ACCOUNT_TARGET=
AUDIT_TARGET=
- QUOTA_MATCH=
chain=fooX$$
@@ -1881,7 +1880,6 @@ determine_capabilities() {
qt $IPTABLES -A $chain -j MARK --set-mark 5 && MARK_ANYWHERE=Yes
qt $IPTABLES -A $chain -j ACCOUNT --addr 192.168.1.0/29 --tname $chain && ACCOUNT_TARGET=Yes
qt $IPTABLES -A $chain -j AUDIT --type drop && AUDIT_TARGET=Yes
- qt $IPTABLES -A $chain -m quota --quota 1000 & QUOTA_MATCH=Yes
qt $IPTABLES -F $chain
qt $IPTABLES -X $chain
qt $IPTABLES -F $chain1
@@ -1975,7 +1973,6 @@ report_capabilities() {
report_capability "Header Match" $HEADER_MATCH
report_capability "ACCOUNT Target" $ACCOUNT_TARGET
report_capability "AUDIT Target" $AUDIT_TARGET
- report_capability "Quota Match" $QUOTA_MATCH
report_capability "ipset V5" $IPSET_V5
fi
@@ -2046,7 +2043,6 @@ report_capabilities1() {
report_capability1 HEADER_MATCH
report_capability1 ACCOUNT_TARGET
report_capability1 AUDIT_TARGET
- report_capability1 QUOTA_MATCH
report_capability1 IPSET_V5
echo CAPVERSION=$SHOREWALL_CAPVERSION
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ uberSVN's rich system and user administration capabilities and model configuration take the hassle out of deploying and managing Subversion and the tools developers use with it. Learn more about uberSVN and get a free download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
