From: Lukas Schauer <lukas@schauer.so>
Date: Sun, 8 Apr 2018 20:16:54 +0000 (+0200)
Subject: also run request_failure and invalid_challenge when HOOK_CHAIN is defined (fixes... 
X-Git-Tag: v0.6.2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a67816468ab65339aeaaa548657e252470ea768f;p=thirdparty%2Fdehydrated.git

also run request_failure and invalid_challenge when HOOK_CHAIN is defined (fixes #450)
---

diff --git a/dehydrated b/dehydrated
index 2975460..c28418b 100755
--- a/dehydrated
+++ b/dehydrated
@@ -544,7 +544,7 @@ http_request() {
       echo >&2
 
       # An exclusive hook for the {1}-request error might be useful (e.g., for sending an e-mail to admins)
-      if [[ -n "${HOOK}" ]] && [[ "${HOOK_CHAIN}" != "yes" ]]; then
+      if [[ -n "${HOOK}" ]]; then
         errtxt="$(cat ${tempcont})"
         errheaders="$(cat ${tempheaders})"
         "${HOOK}" "request_failure" "${statuscode}" "${errtxt}" "${1}" "${errheaders}"
@@ -799,7 +799,7 @@ sign_csr() {
     if [[ "${reqstatus}" = "valid" ]]; then
       echo " + Challenge is valid!"
     else
-      [[ -n "${HOOK}" ]] && [[ "${HOOK_CHAIN}" != "yes" ]] && "${HOOK}" "invalid_challenge" "${altname}" "${result}"
+      [[ -n "${HOOK}" ]] && "${HOOK}" "invalid_challenge" "${altname}" "${result}"
       break
     fi
     idx=$((idx+1))