[PATCH 1/2] Fix Completion iptables -t raw security

[PATCH 1/2] Fix Completion iptables -t raw security

[a-wing]

---
 Completion/Linux/Command/_iptables | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Completion/Linux/Command/_iptables b/Completion/Linux/Command/_iptables
index 447d7c932..ae8d66ea4 100644
--- a/Completion/Linux/Command/_iptables
+++ b/Completion/Linux/Command/_iptables
@@ -7,7 +7,7 @@ case $service in
   iptables-save | ip6tables-save)
     _arguments -s \
       {-c,--counters}'[include values of packet and byte counters in output]' \
-      {-t,--table}'[specify table]:table:(filter nat mangle)'
+      {-t,--table}'[specify table]:table:(filter nat mangle raw security)'
     return
   ;;
   iptables-restore | ip6tables-restore)
@@ -89,7 +89,7 @@ esac
 local i=1
 typeset -U args
 while
-  (( i=words[(ib.i.)-m|--match]+1 )) 
+  (( i=words[(ib.i.)-m|--match]+1 ))
 (( i<CURRENT )); do
   case ${words[i]}; in
     ah) args+=( '--ahspi[match SPIs in AH header]:*^!:spi' ) ;;
@@ -158,7 +158,7 @@ done
 _arguments -C -s \
   '(-)'{-h,--help}'[print program information]' \
   '(-)'{-V,--version}'[print version information]' \
-  '(-h --help -V --version)'{-t,--table}'[specify table]:table:(filter nat mangle)' \
+  '(-h --help -V --version)'{-t,--table}'[specify table]:table:(filter nat mangle raw security)' \
   "($rcmds $cmds)"{-A,--append}'[append rules to end of specified chain]:chain:->chains' \
   "($rcmds $cmds -c --set-counters)"{-D,--delete}'[delete rules from specified chain]:chain:->chains::rule number:->rulenums' \
   "($rcmds $cmds)"{-I,--insert}'[insert rules before specified rule number]:chain:->chains::rule number:->rulenums' \
-- 
2.19.0

[PATCH 2/2] Fix Completion iptables 194: ;& => ;;

[a-wing]

---
 Completion/Linux/Command/_iptables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Completion/Linux/Command/_iptables b/Completion/Linux/Command/_iptables
index ae8d66ea4..2d9697418 100644
--- a/Completion/Linux/Command/_iptables
+++ b/Completion/Linux/Command/_iptables
@@ -191,7 +191,7 @@ case "$state" in
     _wanted targets expl 'builtin target' compadd \
         ACCEPT DROP QUEUE RETURN DNAT DSCP ECN LOG MARK MASQUERADE MIRROR \
 	REDIRECT REJECT SNAT TCPMSS TOS ULOG && ret=0
-  ;&
+  ;;
   user-chains)
     _wanted chains expl 'user-defined chain' compadd \
 	${${${${(M)${(f)"$(_call_program chains $words[1] \
-- 
2.19.0

Re: [PATCH 1/2] Fix Completion iptables -t raw security

[Daniel Shahaf]

a-wing wrote on Mon, 08 Oct 2018 11:24 +0800:
> @@ -89,7 +89,7 @@ esac
> -  (( i=words[(ib.i.)-m|--match]+1 )) 
> +  (( i=words[(ib.i.)-m|--match]+1 ))

Thanks, applied.  In the future please try to avoid unrelated whitespace changes.

Re: [PATCH 2/2] Fix Completion iptables 194: ;& => ;;

[Daniel Shahaf]

a-wing wrote on Mon, 08 Oct 2018 11:24 +0800:
> ---
>  Completion/Linux/Command/_iptables | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Completion/Linux/Command/_iptables b/Completion/Linux/
> Command/_iptables
> index ae8d66ea4..2d9697418 100644
> --- a/Completion/Linux/Command/_iptables
> +++ b/Completion/Linux/Command/_iptables
> @@ -191,7 +191,7 @@ case "$state" in
>      _wanted targets expl 'builtin target' compadd \
>          ACCEPT DROP QUEUE RETURN DNAT DSCP ECN LOG MARK MASQUERADE MIRROR \
>  	REDIRECT REJECT SNAT TCPMSS TOS ULOG && ret=0
> -  ;&
> +  ;;

I'm sorry but this patch is wrong.  iptables(8) explicitly states:

[[[
TARGETS
                                                    … the value of the target,
       which can be the name of a user-defined chain, one of the targets
       described in iptables-extensions(8), or one of the special values
       ACCEPT, DROP or RETURN.
]]]

For future reference, log messages should describe the functional change and
its purpose, not the syntactic change.  That is, it should say something
_beyond_ what can be understood by parsing the unidiff.

Thanks for the patch,

Daniel

Re: [PATCH 2/2] Fix Completion iptables 194: ;& => ;;

[Daniel Shahaf]

Daniel Shahaf wrote on Mon, 08 Oct 2018 13:52 +0000:
> For future reference, log messages should describe the functional change and
> its purpose, not the syntactic change.  That is, it should say something
> _beyond_ what can be understood by parsing the unidiff.

For example, "Don't complete user-defined chains when completing targets".