From 5faf0b9a6fe59bd676e49d4960c22c0a636662f1 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Mon, 17 Oct 2011 12:00:56 +0000 Subject: [PATCH] Bugfix#413: Thanks Brad Smith Fix installation of the ldns-config.1 manpage to come from $(srcdir) so that srcdir may be different then builddir. Removed unused variable from dnssec.c. --- Changelog | 2 +- Makefile.in | 2 +- dnssec.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index f32ca3f5..2e85fd86 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,5 @@ 1.6.12 - * + * bugfix #413: Fix manpage source for srcdir != builddir 1.6.11 2011-09-29 * bugfix #394: Fix socket leak on errors diff --git a/Makefile.in b/Makefile.in index e1399acc..33944f3d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -216,7 +216,7 @@ install-manpages: manpages done if [ $(INSTALL_LDNS_CONFIG) = "yes" ] ; then \ ${INSTALL} -d $(DESTDIR)$(mandir)/man1; \ - ${INSTALL} -c -m 444 packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/; \ + ${INSTALL} -c -m 444 $(srcdir)/packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/; \ fi uninstall-manpages: diff --git a/dnssec.c b/dnssec.c index b36e3f35..45430cd4 100644 --- a/dnssec.c +++ b/dnssec.c @@ -105,7 +105,6 @@ ldns_dnssec_nsec3_closest_encloser(ldns_rdf *qname, uint8_t *salt; ldns_rdf *sname, *hashed_sname, *tmp; - ldns_rr *ce; bool flag; bool exact_match_found; @@ -131,7 +130,6 @@ ldns_dnssec_nsec3_closest_encloser(ldns_rdf *qname, sname = ldns_rdf_clone(qname); - ce = NULL; flag = false; zone_name = ldns_dname_left_chop(ldns_rr_owner(nsec)); -- 2.47.3