From 3019f2d27af392f38fa079169984cba5e1127552 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Sat, 15 Jun 2024 14:58:40 +0200
Subject: [PATCH] create_opendkim_key.sh: fix error: don't ignore secret key
 from configuration file; add file with public dkim key as one-liner.

---
 create_opendkim_key.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/create_opendkim_key.sh b/create_opendkim_key.sh
index 916a02e..62b8b0f 100755
--- a/create_opendkim_key.sh
+++ b/create_opendkim_key.sh
@@ -523,7 +523,7 @@ if $update_dns && [[ -z "$update_zone" ]] ; then
 fi
 if $update_dns && [[ -z "$key_secret" ]] ; then
 	fatal "No secret for the update key used by nsupdate is given!"
-else
+elif [[ -z "$key_secret" ]] ; then
    key_secret="${DEFAULT_key_secret}"
 fi
 if $update_dns && [[ -z "$key_algo" ]]; then
@@ -1210,6 +1210,20 @@ else
    error "$(cat $log_file)"
 fi
 
+echononl "   Print out public key as one line.."
+: > ${key_dir}/${dkim_selector}.public.one-line
+while IFS='' read -r _line || [[ -n $_line ]] ; do
+
+   if echo "$_line" | grep -i -q -E "^---" 2> /dev/null ; then
+      continue
+   fi
+
+   echo -n "${_line}" >> ${key_dir}/${dkim_selector}.public.one-line
+
+done < "${key_dir}/${dkim_selector}.public"
+echo_ok
+generated_files_arr+=("${key_dir}/${dkim_selector}.public.one-line")
+
 
 # - Generate TXT record for use in bind9
 # -
@@ -1236,6 +1250,7 @@ while IFS='' read -r _line || [[ -n $_line ]] ; do
    echo "" >> ${key_dir}/${dkim_selector}.bind9
    echo -n "   \"$_line\"" >> ${key_dir}/${dkim_selector}.bind9
 
+
 done < "${key_dir}/${dkim_selector}.public"
 echo " )" >> ${key_dir}/${dkim_selector}.bind9
 echo_ok