diff options
| author |   krw <krw@openbsd.org> | 2017-08-08 17:54:24 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2017-08-08 17:54:24 +0000 |
| commit | ff3c251f7f43f82cab2333e59c7cc74345963025 (patch) | |
| tree | f880f67bdbcc19e9ef65c36322fb80ef1118e6b9 | |
| parent | Mandoc no longer uses names that only occur in the SYNOPSIS. (diff) | |
| download | wireguard-openbsd-ff3c251f7f43f82cab2333e59c7cc74345963025.tar.xz wireguard-openbsd-ff3c251f7f43f82cab2333e59c7cc74345963025.zip | |
Rename resolv_conf_priority() to default_route_index() to
reflect what it does.
| -rw-r--r-- | sbin/dhclient/kroute.c | 6 | ||||
| -rw-r--r-- | sbin/dhclient/privsep.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/privsep.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c index 441158206d0..9796e2ed33a 100644 --- a/sbin/dhclient/kroute.c +++ b/sbin/dhclient/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.133 2017/08/08 17:20:09 krw Exp $ */ +/* $OpenBSD: kroute.c,v 1.134 2017/08/08 17:54:24 krw Exp $ */ /* * Copyright 2012 Kenneth R Westerback <krw@openbsd.org> @@ -716,11 +716,11 @@ priv_write_resolv_conf(uint8_t *contents, size_t sz) } /* - * resolv_conf_priority returns the index of the interface which the + * default_route_index returns the index of the interface which the * default route is on. */ int -resolv_conf_priority(int rdomain, int routefd) +default_route_index(int rdomain, int routefd) { struct iovec iov[3]; struct sockaddr_in sin; diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c index d2c75d16b7e..a2d48687d0a 100644 --- a/sbin/dhclient/privsep.c +++ b/sbin/dhclient/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.61 2017/08/06 22:05:16 krw Exp $ */ +/* $OpenBSD: privsep.c,v 1.62 2017/08/08 17:54:24 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -98,7 +98,7 @@ dispatch_imsg(char *name, int rdomain, int ioctlfd, int routefd, case IMSG_WRITE_RESOLV_CONF: if (imsg.hdr.len <= IMSG_HEADER_SIZE) log_warnx("short IMSG_WRITE_RESOLV_CONF"); - else if (resolv_conf_priority(rdomain, routefd) == + else if (default_route_index(rdomain, routefd) == index) priv_write_resolv_conf(imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE); diff --git a/sbin/dhclient/privsep.h b/sbin/dhclient/privsep.h index 33855cacebe..2a67b607344 100644 --- a/sbin/dhclient/privsep.h +++ b/sbin/dhclient/privsep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.h,v 1.51 2017/08/05 12:35:17 krw Exp $ */ +/* $OpenBSD: privsep.h,v 1.52 2017/08/08 17:54:24 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -48,13 +48,13 @@ struct imsg_set_mtu { }; int dispatch_imsg(char *, int, int, int, struct imsgbuf *); +int default_route_index(int, int); void priv_add_route(char *, int, int, struct imsg_add_route *); void priv_flush_routes(char *, int, int); char *resolv_conf_contents(char *, uint8_t *, unsigned int, uint8_t *, unsigned int); -int resolv_conf_priority(int, int); void priv_write_resolv_conf(uint8_t *, size_t); void priv_delete_address(char *, int, struct imsg_delete_address *); |