Save Gandi LiveDNS variables with prefix 'SAVED_'

Fixes #6081.

Author: pini-gh

dnsapi/dns_gandi_livedns.sh

@@ -23,6 +23,9 @@ dns_gandi_livedns_add() {
   fulldomain=$1
   txtvalue=$2
 
+  # Environment variables take precedence against saved configuration
+  GANDI_LIVEDNS_KEY="${GANDI_LIVEDNS_KEY:-${SAVED_GANDI_LIVEDNS_KEY:-}}"
+  GANDI_LIVEDNS_TOKEN="${GANDI_LIVEDNS_TOKEN:-${SAVED_GANDI_LIVEDNS_TOKEN:-}}"
   if [ -z "$GANDI_LIVEDNS_KEY" ] && [ -z "$GANDI_LIVEDNS_TOKEN" ]; then
     _err "No Token or API key (deprecated) specified for Gandi LiveDNS."
     _err "Create your token or key and export it as GANDI_LIVEDNS_KEY or GANDI_LIVEDNS_TOKEN respectively"
@@ -31,12 +34,15 @@ dns_gandi_livedns_add() {
 
   # Keep only one secret in configuration
   if [ -n "$GANDI_LIVEDNS_TOKEN" ]; then
-    _saveaccountconf GANDI_LIVEDNS_TOKEN "$GANDI_LIVEDNS_TOKEN"
-    _clearaccountconf GANDI_LIVEDNS_KEY
+    _saveaccountconf SAVED_GANDI_LIVEDNS_TOKEN "$GANDI_LIVEDNS_TOKEN"
+    _clearaccountconf SAVED_GANDI_LIVEDNS_KEY
   elif [ -n "$GANDI_LIVEDNS_KEY" ]; then
-    _saveaccountconf GANDI_LIVEDNS_KEY "$GANDI_LIVEDNS_KEY"
-    _clearaccountconf GANDI_LIVEDNS_TOKEN
+    _saveaccountconf SAVED_GANDI_LIVEDNS_KEY "$GANDI_LIVEDNS_KEY"
+    _clearaccountconf SAVED_GANDI_LIVEDNS_TOKEN
   fi
+  # Remove old configuration without the 'SAVED_' keyword
+  _clearaccountconf GANDI_LIVEDNS_KEY
+  _clearaccountconf GANDI_LIVEDNS_TOKEN
 
   _debug "First detect the root zone"
   if ! _get_root "$fulldomain"; then