On Fri, 2011-08-26 at 19:32 +0100, Steven Jan Springl wrote:

> The following shorewall6 message is produced after recreating the 
> capabilities 
> file:
> 
> WARNING: Unknown capability (QUOTA_MATCH) 
> ignored : /etc/shorewall66/capabilities (line 55)

Hmmm -- I should have checked Shorewall6 when I corrected a similar
defect in Shorewall.

Patch attached.

Thanks, Steven

-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/Shorewall6/lib.cli b/Shorewall6/lib.cli
index 72bfa30..d21c38b 100644
--- a/Shorewall6/lib.cli
+++ b/Shorewall6/lib.cli
@@ -1550,7 +1550,6 @@ determine_capabilities() {
     HEADER_MATCH=
     ACCOUNT_TARGET=
     AUDIT_TARGET=
-    QUOTA_MATCH=
     IPSET_V5=
 
     chain=fooX$$
@@ -1703,7 +1702,6 @@ determine_capabilities() {
     qt $IP6TABLES -A $chain -m ipv6header --header 255 && HEADER_MATCH=Yes
     qt $IP6TABLES -A $chain -j ACCOUNT --addr 1::/122 --tname $chain && ACCOUNT_TARGET=Yes
     qt $IP6TABLES -A $chain -j AUDIT --type drop && AUDIT_TARGET=Yes
-    qt $IP6TABLES -A $chain -m quota --quota 1000 && QUOTA_MATCH=Yes
     
 
     qt $IP6TABLES -F $chain
@@ -1796,7 +1794,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
 
@@ -1864,7 +1861,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

Attachment: signature.asc
Description: This is a digitally signed message part

------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management 
Up to 160% more powerful than alternatives and 25% more efficient. 
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel

Reply via email to