From: Lukas Schauer <lukas@schauer.so>
Date: Sat, 17 Mar 2018 00:40:19 +0000 (+0100)
Subject: removed dual use of challenge_identifiers variable (fixes #511)
X-Git-Tag: v0.6.2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f1ff678706fdfe169611ea25fd41ccf9cd6760e;p=thirdparty%2Fdehydrated.git

removed dual use of challenge_identifiers variable (fixes #511)
---

diff --git a/dehydrated b/dehydrated
index 43de63b..473bbf1 100755
--- a/dehydrated
+++ b/dehydrated
@@ -667,14 +667,15 @@ sign_csr() {
   fi
 
   if [[ -n "${ZSH_VERSION:-}" ]]; then
-    local -A challenge_identifiers challenge_uris challenge_tokens authorizations keyauths deploy_args
+    local -A challenge_names challenge_uris challenge_tokens authorizations keyauths deploy_args
   else
-    local -a challenge_identifiers challenge_uris challenge_tokens authorizations keyauths deploy_args
+    local -a challenge_names challenge_uris challenge_tokens authorizations keyauths deploy_args
   fi
 
   # Initial step: Find which authorizations we're dealing with
   if [[ ${API} -eq 2 ]]; then
     # Request new order and store authorization URIs
+    local challenge_identifiers=""
     for altname in ${altnames}; do
       challenge_identifiers+="$(printf '{"type": "dns", "value": "%s"}, ' "${altname}")"
     done
@@ -731,7 +732,7 @@ sign_csr() {
     fi
 
     # Gather challenge information
-    challenge_identifiers[${idx}]="${identifier}"
+    challenge_names[${idx}]="${identifier}"
     challenge_tokens[${idx}]="$(echo "${challenge}" | get_json_string_value token)"
     if [[ ${API} -eq 2 ]]; then
       challenge_uris[${idx}]="$(echo "${challenge}" | get_json_string_value url)"
@@ -781,7 +782,7 @@ sign_csr() {
   # Validate pending challenges
   local idx=0
   while [ ${idx} -lt ${num_pending_challenges} ]; do
-    echo " + Responding to challenge for ${challenge_identifiers[${idx}]} authorization..."
+    echo " + Responding to challenge for ${challenge_names[${idx}]} authorization..."
 
     # Ask the acme-server to verify our challenge and wait until it is no longer pending
     if [[ ${API} -eq 1 ]]; then