diff options
| -rw-r--r-- | sbin/dhclient/dhclient.8 | 10 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 15 |
2 files changed, 5 insertions, 20 deletions
diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8 index c1438bd2bb0..0c4a8296da0 100644 --- a/sbin/dhclient/dhclient.8 +++ b/sbin/dhclient/dhclient.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhclient.8,v 1.32 2017/07/17 15:05:03 krw Exp $ +.\" $OpenBSD: dhclient.8,v 1.33 2017/09/22 14:04:13 krw Exp $ .\" .\" Copyright (c) 1997 The Internet Software Consortium. .\" All rights reserved. @@ -35,7 +35,7 @@ .\" Enterprises. To learn more about the Internet Software Consortium, .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. -.Dd $Mdocdate: July 17 2017 $ +.Dd $Mdocdate: September 22 2017 $ .Dt DHCLIENT 8 .Os .Sh NAME @@ -44,7 +44,6 @@ .Sh SYNOPSIS .Nm .Op Fl d | q -.Op Fl u .Op Fl c Ar file .Op Fl i Ar options .Op Fl L Ar file @@ -125,11 +124,6 @@ for the leases file. Forces .Nm to be less verbose on startup. -.It Fl u -Forces -.Nm -to reject leases with unknown options in them. -The default behaviour is to accept such lease offers. .El .Pp The DHCP protocol allows a host to contact a central server which diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 76a38846f83..bf4a33e7a5c 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.512 2017/09/21 15:23:25 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.513 2017/09/22 14:04:13 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -104,7 +104,6 @@ char path_option_db[PATH_MAX]; int log_perror = 1; int nullfd = -1; int daemonize = 1; -int unknown_ok = 1; volatile sig_atomic_t quit; @@ -446,7 +445,7 @@ main(int argc, char *argv[]) log_setverbose(1); q_flag = d_flag = 0; - while ((ch = getopt(argc, argv, "c:di:l:L:qu")) != -1) + while ((ch = getopt(argc, argv, "c:di:l:L:q")) != -1) switch (ch) { case 'c': path_dhclient_conf = optarg; @@ -476,9 +475,6 @@ main(int argc, char *argv[]) case 'q': q_flag = 1; break; - case 'u': - unknown_ok = 0; - break; default: usage(); } @@ -694,7 +690,7 @@ usage(void) extern char *__progname; fprintf(stderr, - "usage: %s [-d | -q] [-u] [-c file] [-i options] [-L file] " + "usage: %s [-d | -q] [-c file] [-i options] [-L file] " "[-l file] interface\n", __progname); exit(1); } @@ -1159,11 +1155,6 @@ packet_to_lease(struct interface_info *ifi, struct option_data *options) if (options[i].len == 0) continue; name = code_to_name(i); - if (unknown_ok == 0 && strncmp("option-", name, 7) == 0) { - log_warnx("%s: unknown option %s", - log_procname, name); - goto decline; - } pretty = pretty_print_option(i, &options[i], 0); if (strlen(pretty) == 0) continue; |