From 491ddf885c1ddecd31810168ffa33e00662ede30 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 14 Mar 2018 13:29:37 -0400
Subject: [PATCH] If ACCOUNT_URL is empty when we need it, re-read it. Fixes
 #1360

---
 acme.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/acme.sh b/acme.sh
index e7c40c01..a193e656 100755
--- a/acme.sh
+++ b/acme.sh
@@ -1826,6 +1826,17 @@ _send_signed_request() {
       if [ "$url" = "$ACME_NEW_ACCOUNT" ] || [ "$url" = "$ACME_REVOKE_CERT" ]; then
         protected="$JWK_HEADERPLACE_PART1$nonce\", \"url\": \"${url}$JWK_HEADERPLACE_PART2, \"jwk\": $jwk"'}'
       else
+        if [ -z "${ACCOUNT_URL}" ]; then
+          _info "Re-reading ACCOUNT_URL"
+          _debug2 "ACCOUNT_URL was empty!"
+          _accUri=$(_readcaconf "ACCOUNT_URL")
+          export ACCOUNT_URL="${_accUri}"
+          _debug2 ACCOUNT_URL "${ACCOUNT_URL}"
+          if [ -z "${ACCOUNT_URL}" ]; then
+            _err "Cannot locate account URL."
+            return 1
+          fi
+        fi
         protected="$JWK_HEADERPLACE_PART1$nonce\", \"url\": \"${url}$JWK_HEADERPLACE_PART2, \"kid\": \"${ACCOUNT_URL}\""'}'
       fi
     else