Re: git: 1d577bedbae8 - main - unbound: Fix config file path
- Reply: Cy Schubert : "Re: git: 1d577bedbae8 - main - unbound: Fix config file path"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 18 Jan 2023 13:35:34 UTC
> The branch main has been updated by otis (ports committer): > > URL: https://cgit.FreeBSD.org/src/commit/?id=1d577bedbae80ced38ccb834e6835e5fd98bc411 > > commit 1d577bedbae80ced38ccb834e6835e5fd98bc411 > Author: Juraj Lutter <otis@FreeBSD.org> > AuthorDate: 2023-01-17 17:25:47 +0000 > Commit: Juraj Lutter <otis@FreeBSD.org> > CommitDate: 2023-01-18 07:50:07 +0000 > > unbound: Fix config file path > > Commit 1838dec31895fd4752fa8631322ab93be0705a66 changed the > config file path to /usr/local/etc/unbound/unbound.conf which > is wrong for unbound in base. > > Reported by: Ihor Antonov <ihor_AT_antonovs_family> > Reviewed by: zlei > Approved by: zlei > Differential Revision: https://reviews.freebsd.org/D38106 > > Fixes: 1838dec31895fd4752fa8631322ab93be0705a66 > MFC after: 1 month > X-MFC with: 1838dec31895fd4752fa8631322ab93be0705a66 > --- > usr.sbin/unbound/config.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h > index bd36bb7573f8..2068cbfe7295 100644 > --- a/usr.sbin/unbound/config.h > +++ b/usr.sbin/unbound/config.h > @@ -21,7 +21,7 @@ > #define CONFCMDLINE "--with-ssl=/usr --with-libexpat=/usr --disable-dnscrypt --disable-dnstap --enable-ecdsa --disable-event-api --enable-gost --with-libevent --disable-subnet --disable-tfo-client --disable-tfo-server --with-pthreads--prefix=/usr --localstatedir=/var/unbound --mandir=/usr/share/man --build=freebsd" > > /* Pathname to the Unbound configuration file */ > -#define CONFIGFILE "/usr/local/etc/unbound/unbound.conf" > +#define CONFIGFILE "/var/unbound/unbound.conf" Should this redirect through the /etc/unbound symbolic link? For example if I have modified the /etc/unbound -> ../var/unbound symbolic link /etc/unbound -> ../nodedata/etc/unbound your change is going to cause me to scratch my head why unbound is not reading my config file. Further it appears as if local-unbound.conf refers to the /etc/unbound path and does not mention /var/unbound. And an existing bug that may no longer be present is why do all the manpages installed have a local- prefix on them, but the binaries are installed without that? It also appears as if there is some @foo_path@ stuff in the man pages that should of been fixed up by the installer process to use the values compiled in. Thanks, Rod > > /* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work > */ > -- Rod Grimes rgrimes@freebsd.org