Merge tag 'zsh-5.4.2-test-2' / 'upstream' branch into 'debian' branch

Test version 2 prior to zsh 5.5.

1 files changed, 3 insertions, 1 deletions

diff --git a/Completion/Unix/Command/_dhclient b/Completion/Unix/Command/_dhclient
index 10cb551e0..b5889df21 100644
--- a/Completion/Unix/Command/_dhclient
+++ b/Completion/Unix/Command/_dhclient
@@ -7,19 +7,20 @@ case $OSTYPE in
     args+=(
       '-c+[specify configuration file]:file:_files'
       '-l+[specify leases file]:file:_files'
-      '-u[reject leases with unknown options]'
     )
   ;|
   freebsd*)
     args+=(
       '(-d)-b[immediately move to the background]'
       '-p+[specify PID file]:file:_files'
+      '-u[reject leases with unknown options]'
     )
   ;;
   openbsd*)
     args+=(
       '-i+[ignore values provided by leases for specified options]:options'
       '-L+[specify file to write option data too]:file:_files'
+      "-n[don't configure any interfaces]"
     )
   ;;
   *) # ISC implementation, used on Linux and NetBSD
@@ -60,6 +61,7 @@ case $OSTYPE in
       '-V[specify vendor-class-identifier option]:option'
       '--request-options[specify list of options the client is to request from the server]:options'
       '--timeout[specify time after which dhclient will decide that no DHCP servers can be contacted]:timeout'
+      '--dad-wait-time[specify maximum time to wait for duplicate address detection]:time (seconds)'
     )
   ;;
 esac