summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2018-08-13 14:10:26 +0000
committerpatrick <patrick@openbsd.org>2018-08-13 14:10:26 +0000
commitf4597f101c0bf97a73d4e948a95f2424b768c3ee (patch)
tree76f734139f32519c5eebc1994de20dbd0acdd62d
parentAdd a test covering the recently fixed issue with dangling knote references upon (diff)
downloadwireguard-openbsd-f4597f101c0bf97a73d4e948a95f2424b768c3ee.tar.xz
wireguard-openbsd-f4597f101c0bf97a73d4e948a95f2424b768c3ee.zip
The iterator i is not the option code, but simply the index for the
array that stores the option codes. Fixes the issue where it named an incorrect option on error. Found by Florian Kaiser ok krw@
-rw-r--r--sbin/dhclient/dhclient.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 7dfbe8d7774..b7762c763e9 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.575 2018/06/20 12:10:46 sthen Exp $ */
+/* $OpenBSD: dhclient.c,v 1.576 2018/08/13 14:10:26 patrick Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -1230,7 +1230,7 @@ packet_to_lease(struct interface_info *ifi, struct option_data *options)
*/
for (i = 0; i < config->required_option_count; i++) {
if (lease->options[config->required_options[i]].len == 0) {
- name = code_to_name(i);
+ name = code_to_name(config->required_options[i]);
log_warnx("%s: %s required but missing", log_procname,
name);
goto decline;