From a07f1000bafedaebe2bfffbf631e4e1b75963811 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 30 Oct 2015 10:37:38 +0100 Subject: [PATCH] dns-unbound: use the correct path when calling dnssec-trigger-script Debian systems don't have /usr/libexec, so the script is installed in a different path. Based on a patch from Arto Jantunen --- configure.ac | 10 ++++++++++ src/dns-manager/nm-dns-unbound.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e7d3ed9279..57d3210018 100644 --- a/configure.ac +++ b/configure.ac @@ -833,6 +833,16 @@ fi AC_DEFINE_UNQUOTED(DNSMASQ_PATH, "$DNSMASQ_PATH", [Define to path of dnsmasq binary]) AC_SUBST(DNSMASQ_PATH) +# dnssec-trigger-script path +AC_ARG_WITH(dnssec_trigger, AS_HELP_STRING([--with-dnssec-trigger=/path/to/dnssec-trigger-script], [path to unbound dnssec-trigger-script])) +if test "x${with_dnssec_trigger}" = x; then + AC_PATH_PROG(DNSSEC_TRIGGER_SCRIPT, dnssec-trigger-script, /usr/libexec/dnssec-trigger-script, /usr/local/libexec:/usr/local/lib:/usr/local/lib/dnssec-trigger:/usr/libexec:/usr/lib:/usr/lib/dnssec-trigger) +else + DNSSEC_TRIGGER_SCRIPT="$with_dnssec_trigger" +fi +AC_DEFINE_UNQUOTED(DNSSEC_TRIGGER_SCRIPT, "$DNSSEC_TRIGGER_SCRIPT", [Define to path of unbound dnssec-trigger-script]) +AC_SUBST(DNSSEC_TRIGGER_SCRIPT) + # system CA certificates path AC_ARG_WITH(system-ca-path, AS_HELP_STRING([--with-system-ca-path=/path/to/ssl/certs], [path to system CA certificates])) if test "x${with_system_ca_path}" = x; then diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c index 08a7cd3ae0..d36e3f8576 100644 --- a/src/dns-manager/nm-dns-unbound.c +++ b/src/dns-manager/nm-dns-unbound.c @@ -43,7 +43,7 @@ update (NMDnsPlugin *plugin, * without calling custom scripts. The dnssec-trigger functionality * may be eventually merged into NetworkManager. */ - return nm_spawn_process ("/usr/libexec/dnssec-trigger-script --async --update", NULL) == 0; + return nm_spawn_process (DNSSEC_TRIGGER_SCRIPT " --async --update", NULL) == 0; } static gboolean