On Sat, Jul 01, 2017 at 05:27:56PM -0600, Kenneth R Westerback wrote:
> CVSROOT: /cvs
> Module name: src
> Changes by: k...@cvs.openbsd.org 2017/07/01 17:27:56
>
> Modified files:
> sbin/dhclient : dhclient.c dhcpd.h dispatch.c kroute.c
> privsep.c privsep.h
>
> Log message:
> Eliminate multiple socket openings/closings and pass
> fd'd from main loops as required. One socket to do
> ioctl's per process (called ioctlfd) and one socket to
> do route messages per socket (called routefd).
>
> Clean up local variable declaration lists in passing.
That commit seems to break the tree:
/usr/src/sbin/dhclient/privsep.c:98: error: implicit declaration of
function 'resolv_conf_priority'
Patch below fixes it.
Index: privsep.c
===================================================================
RCS file: /cvs/OpenBSD/src/sbin/dhclient/privsep.c,v
retrieving revision 1.53
diff -u -p -u -r1.53 privsep.c
--- privsep.c 1 Jul 2017 23:27:56 -0000 1.53
+++ privsep.c 2 Jul 2017 08:21:47 -0000
@@ -35,6 +35,8 @@
#include "log.h"
#include "privsep.h"
+int resolv_conf_priority(int, int);
+
int
dispatch_imsg(struct interface_info *ifi, int ioctlfd, int routefd,
struct imsgbuf *ibuf)
@@ -95,7 +97,7 @@ dispatch_imsg(struct interface_info *ifi
case IMSG_WRITE_RESOLV_CONF:
if (imsg.hdr.len <= IMSG_HEADER_SIZE)
log_warnx("short IMSG_WRITE_RESOLV_CONF");
- else if (resolv_conf_priority(ifi->rdomain))
+ else if (resolv_conf_priority(ifi->rdomain, routefd))
priv_write_resolv_conf(imsg.data,
imsg.hdr.len - IMSG_HEADER_SIZE);
break;
--
Matthieu Herrb
