Merge branch 'TinCanTech-bugfix-tools.lib-renew-san-ip-address'

Signed-off-by: Richard T Bonhomme <[email protected]>
OpenVPN · Nov 2, 2024 · 8b794db · 8b794db
2 parents 0115928 + b41f4a2
commit 8b794db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
 
 3.2.2 (TBD)
 
+   * bugfix: easyrsa-tools.lib: renew SAN, remove excess word 'Address' (af17492) (#1251)
    * New global variable 'EASYRSA_DISABLE_INLINE' (ad257ab) (#1245)
    * bugfix: revoke, renew: Remove pki/inline/private/$file.inline (febef85) (#1244)
      Initial bug report #1242 (Minor)

diff --git a/dev/easyrsa-tools.lib b/dev/easyrsa-tools.lib
@@ -775,7 +775,8 @@ Cannot renew this certificate, a conflicting file exists:
 			"$EASYRSA_OPENSSL" x509 -in "$crt_in" -noout -text | \
 				grep -A 1 'X509v3 Subject Alternative Name' | \
 					sed -e s/'^\ *'// \
-						-e /'X509v3 Subject Alternative Name'/d
+						-e /'X509v3 Subject Alternative Name'/d \
+						-e s/'IP Address'/IP/
 		)" || die "renew - EASYRSA_SAN: easyrsa_openssl subshell"
 		verbose "renew: EASYRSA_SAN: ${EASYRSA_SAN}"