From 7128e6b63c115f6a6b2ca4e369a0c717d0a436f8 Mon Sep 17 00:00:00 2001
From: Lukas Schauer <lukas@schauer.dev>
Date: Thu, 7 Apr 2022 01:34:21 +0200
Subject: [PATCH] rfc8738: fix CN on certs with mixed ip+dns

---
 dehydrated | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dehydrated b/dehydrated
index e5b9783..9474d77 100755
--- a/dehydrated
+++ b/dehydrated
@@ -1467,12 +1467,15 @@ sign_domain() {
     for altname in ${altnames}; do
       if [[ "${altname}" =~ ^ip: ]]; then
         SAN="${SAN}IP:${altname:3}, "
-        SUBJ="/CN=${domain:3}/"
       else
         SAN="${SAN}DNS:${altname}, "
-        SUBJ="/CN=${domain}/"
       fi
     done
+    if [[ "${domain}" =~ ^ip: ]]; then
+      SUBJ="/CN=${domain:3}/"
+    else
+      SUBJ="/CN=${domain}/"
+    fi
     SAN="${SAN%%, }"
     local tmp_openssl_cnf
     tmp_openssl_cnf="$(_mktemp)"
-- 
2.47.2