diff options
| author |   krw <krw@openbsd.org> | 2019-01-26 23:26:20 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2019-01-26 23:26:20 +0000 |
| commit | 77941e9485015b3d85f66c82b3e403907e49bf69 (patch) | |
| tree | 94db9fab1877bb170fd7af8df2a4bdde7f2e61e6 | |
| parent | Zap trailing space that stuck its head up. (diff) | |
| download | wireguard-openbsd-77941e9485015b3d85f66c82b3e403907e49bf69.tar.xz wireguard-openbsd-77941e9485015b3d85f66c82b3e403907e49bf69.zip | |
Rename ACTION_NONE to ACTION_USELEASE. TOK_NOACTION to TOK_USELEASE.
More consistent, clearer.
| -rw-r--r-- | sbin/dhclient/clparse.c | 10 | ||||
| -rw-r--r-- | sbin/dhclient/conflex.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhctoken.h | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index fc77de4bf9d..80ce22da5d0 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.181 2019/01/26 22:55:10 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.182 2019/01/26 23:26:20 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -302,7 +302,7 @@ parse_conf_decl(FILE *cfile, char *name) if (count == 0) { for (i = 0; i < DHO_COUNT; i++) if (p[i] == ACTION_IGNORE) - p[i] = ACTION_NONE; + p[i] = ACTION_USELEASE; } else { for (i = 0; i < count; i++) p[list[i]] = ACTION_IGNORE; @@ -333,7 +333,7 @@ parse_conf_decl(FILE *cfile, char *name) if (parse_ip_addr(cfile, &config->next_server) == 1) parse_semi(cfile); break; - case TOK_NOACTION: + case TOK_USELEASE: memset(list, 0, sizeof(list)); count = 0; if (parse_option_list(cfile, &count, list) == 1) { @@ -343,14 +343,14 @@ parse_conf_decl(FILE *cfile, char *name) free(config->defaults[i].data); config->defaults[i].data = NULL; config->defaults[i].len = 0; - p[i] = ACTION_NONE; + p[i] = ACTION_USELEASE; } } else { for (i = 0; i < count; i++) { free(config->defaults[list[i]].data); config->defaults[list[i]].data = NULL; config->defaults[list[i]].len = 0; - p[list[i]] = ACTION_NONE; + p[list[i]] = ACTION_USELEASE; } } parse_semi(cfile); diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c index 0ca5e1eeb76..cba4c6f09e7 100644 --- a/sbin/dhclient/conflex.c +++ b/sbin/dhclient/conflex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conflex.c,v 1.49 2019/01/26 22:55:10 krw Exp $ */ +/* $OpenBSD: conflex.c,v 1.50 2019/01/26 23:26:20 krw Exp $ */ /* Lexical scanner for dhclient config file. */ @@ -382,7 +382,7 @@ static const struct keywords { { "ssid", TOK_SSID }, { "supersede", TOK_SUPERSEDE }, { "timeout", TOK_TIMEOUT }, - { "uselease", TOK_NOACTION } + { "uselease", TOK_USELEASE } }; int kw_cmp(const void *k, const void *e); diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index bc7840206e5..a1b0af7864f 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.271 2019/01/19 21:07:13 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.272 2019/01/26 23:26:20 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -81,7 +81,7 @@ enum dhcp_state { }; enum actions { - ACTION_NONE, + ACTION_USELEASE, ACTION_DEFAULT, ACTION_SUPERSEDE, ACTION_PREPEND, diff --git a/sbin/dhclient/dhctoken.h b/sbin/dhclient/dhctoken.h index bef9cf9a070..c2d749c9826 100644 --- a/sbin/dhclient/dhctoken.h +++ b/sbin/dhclient/dhctoken.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhctoken.h,v 1.15 2019/01/26 22:55:10 krw Exp $ */ +/* $OpenBSD: dhctoken.h,v 1.16 2019/01/26 23:26:20 krw Exp $ */ /* Tokens for config file lexer and parser. */ @@ -74,7 +74,7 @@ #define TOK_IGNORE 295 #define TOK_SSID 296 #define TOK_EPOCH 297 -#define TOK_NOACTION 298 +#define TOK_USELEASE 298 #define is_identifier(x) ((x) >= TOK_FIRST_TOKEN && \ (x) != TOK_STRING && \ |