[PATCH 1/3] Complete telnet options for forcing IP version

[PATCH 1/3] Complete telnet options for forcing IP version

[Aaron Schrab]

Add -4 and -6 options to completion for telnet.
---
 Completion/Unix/Command/_telnet |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/Completion/Unix/Command/_telnet b/Completion/Unix/Command/_telnet
index bab9c8d..a4faa60 100644
--- a/Completion/Unix/Command/_telnet
+++ b/Completion/Unix/Command/_telnet
@@ -12,6 +12,8 @@ if (( ! $+_telnet_args )); then
   local help="$(_call_program options 'telnet -\?' < /dev/null 2>&1)"
   local -A optionmap
   optionmap=(
+    '*\[-4\]*' '-4[Force IPv4 address resolution]'
+    '*\[-6\]*' '-6[Force IPv6 address resolution]'
     '*\[-8\]*' '-8[allow 8-Bit data]'
     '*\[-E\]*' '-E[disable an escape character]'
     '*\[-K\]*' '-K[no automatic login]'
-- 
1.7.10.4

[PATCH 2/3] Complete telnet -b option

[Aaron Schrab]

This option is used in the Debian/Ubuntu implementation of telnet to be
the equivalent of the -s option that was already handled.
---
 Completion/Unix/Command/_telnet |    1 +
 1 file changed, 1 insertion(+)

diff --git a/Completion/Unix/Command/_telnet b/Completion/Unix/Command/_telnet
index a4faa60..81ccfa4 100644
--- a/Completion/Unix/Command/_telnet
+++ b/Completion/Unix/Command/_telnet
@@ -32,6 +32,7 @@ if (( ! $+_telnet_args )); then
     '*\[-n tracefile\]*' '-n+[specify tracefile]:tracefile:_files'
     '*\[-r\]*' '-r[rlogin like user interface]'
     '*\[-s src_addr\]*' '-s+[set source IP address]:src_addr:'
+    '*\[ -b addr \]*' '-b+[set source IP address]:src_addr:'
     '*\[-x\]*' '-x'
     '*\[-t transcom\]*' '-t+:transcom:'
     '*\[-noasynch\]*' '-noasynch'
-- 
1.7.10.4

[PATCH 3/3] Complete SSL options for telnet-ssl

[Aaron Schrab]

Options supported by the telnet command as shipped by Debian/Ubuntu
telnet-ssl package.
---
 Completion/Unix/Command/_telnet |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Completion/Unix/Command/_telnet b/Completion/Unix/Command/_telnet
index 81ccfa4..c7ab34f 100644
--- a/Completion/Unix/Command/_telnet
+++ b/Completion/Unix/Command/_telnet
@@ -38,6 +38,7 @@ if (( ! $+_telnet_args )); then
     '*\[-noasynch\]*' '-noasynch'
     '*\[-noasyncnet\]*' '-noasyncnet'
     '*\[-noasynctty\]*' '-noasynctty'
+    '*\[-z ssl\]*' '*-z[SSL parameters]:SSL parameter:->ssl'
   )
   _telnet_args=($optionmap[(K)"$help"])
   (( $#_telnet_args )) || _telnet_args=( '-l+[specify user]:user:->users' )
@@ -49,6 +50,20 @@ _arguments -C -s \
   ':port:->ports' && ret=0
 
 case "$state" in
+ssl)
+  _values -w 'SSL parameter' \
+    'debug[Send SSL debugging info to stderr]' \
+    '(nossl)ssl[Negotiate SSL connection]' \
+    '(ssl)nossl[Switch off SSL negotiation]' \
+    'certrequired[Require server certificate]' \
+    'secure[No fallback to unencrypted mode]' \
+    'verbose[Be verbose about certificates, etc.]' \
+    'verify[Set SSL verify flags]:int:' \
+    'cert[Specify certificate file]:certificate file:_path_files' \
+    'key[Specify key file]:key file:_path_files' \
+    'cipher[Set preferred cipher list]:ciphers:'
+  ;;
+
 hosts)
   _wanted hosts expl host \
       _combination -s '[@:]' '' users-hosts-ports \
-- 
1.7.10.4