diff options
| author |   krw <krw@openbsd.org> | 2020-05-28 16:02:56 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-05-28 16:02:56 +0000 |
| commit | 2c7c0de7c97ff0b580c0b4837240f4a25daffde1 (patch) | |
| tree | 9a00eb5f6e508e7ba1d258a82c0cc183da339bac | |
| parent | Make generation numbers unsigned and fill them using a random number (diff) | |
| download | wireguard-openbsd-2c7c0de7c97ff0b580c0b4837240f4a25daffde1.tar.xz wireguard-openbsd-2c7c0de7c97ff0b580c0b4837240f4a25daffde1.zip | |
A few stray 'ifa' overloadings.
| -rw-r--r-- | sbin/dhclient/dhclient.c | 8 | ||||
| -rw-r--r-- | sbin/dhclient/kroute.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index f5789b10893..007358c5008 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.676 2020/05/28 15:23:46 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.677 2020/05/28 16:02:56 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -2763,12 +2763,12 @@ tick_msg(const char *preamble, int success, time_t start) void release_lease(struct interface_info *ifi) { - char ifabuf[INET_ADDRSTRLEN]; + char buf[INET_ADDRSTRLEN]; struct option_data *opt; if (ifi->configured == NULL || ifi->active == NULL) return; /* Nothing to release. */ - strlcpy(ifabuf, inet_ntoa(ifi->configured->address), sizeof(ifabuf)); + strlcpy(buf, inet_ntoa(ifi->configured->address), sizeof(buf)); opt = &ifi->active->options[DHO_DHCP_SERVER_IDENTIFIER]; if (opt->len == sizeof(in_addr_t)) @@ -2801,7 +2801,7 @@ release_lease(struct interface_info *ifi) free(ifi->unwind_info); ifi->unwind_info = NULL; - log_warnx("%s: %s RELEASED to %s", log_procname, ifabuf, + log_warnx("%s: %s RELEASED to %s", log_procname, buf, inet_ntoa(ifi->destination)); } diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c index 90e9d456831..579d9b9e625 100644 --- a/sbin/dhclient/kroute.c +++ b/sbin/dhclient/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.186 2020/05/28 15:45:10 krw Exp $ */ +/* $OpenBSD: kroute.c,v 1.187 2020/05/28 16:02:56 krw Exp $ */ /* * Copyright 2012 Kenneth R Westerback <krw@openbsd.org> @@ -307,7 +307,7 @@ route_pos(struct rt_msghdr *rtm, uint8_t *routes, unsigned int routes_len, * * dst=1.2.3.4 netmask=255.255.255.255 gateway = address * - * So replace 0.0.0.0 with ifa for comparison. + * So replace 0.0.0.0 with address for comparison. */ if (routesgatewayaddr == INADDR_ANY) routesgatewayaddr = address.s_addr; |