diff options
Diffstat (limited to 'sbin/dhclient/dhclient.c')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 143a44db134..6afab56706d 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.150 2012/08/21 00:29:32 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.151 2012/08/22 00:14:42 tedu Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1534,6 +1534,9 @@ priv_script_write_params(char *prefix, struct client_lease *lease) if (config->defaults[i].len) { if (lease->options[i].len) { switch (config->default_actions[i]) { + case ACTION_IGNORE: + /* handled below */ + break; case ACTION_DEFAULT: dp = lease->options[i].data; len = lease->options[i].len; @@ -1589,6 +1592,9 @@ supersede: } else { len = 0; } + if (len && config->default_actions[i] == ACTION_IGNORE) { + len = 0; + } if (len) { char name[256]; |