1 |
diff -Nur --no-dereference e-smith-base-5.8.0.old/root/etc/e-smith/templates/etc/openssl.conf/05config e-smith-base-5.8.0/root/etc/e-smith/templates/etc/openssl.conf/05config |
2 |
--- e-smith-base-5.8.0.old/root/etc/e-smith/templates/etc/openssl.conf/05config 2021-04-21 21:53:02.302000000 -0400 |
3 |
+++ e-smith-base-5.8.0/root/etc/e-smith/templates/etc/openssl.conf/05config 2021-04-21 22:07:28.948000000 -0400 |
4 |
@@ -8,9 +8,9 @@ |
5 |
our $commonName = $modSSL{CommonName} || $FQDN; |
6 |
our $crt = "/home/e-smith/ssl.crt/$FQDN.crt"; |
7 |
our $key = "/home/e-smith/ssl.key/$FQDN.key"; |
8 |
- our $defaultCity = $ldap{defaultCity}; |
9 |
- our $defaultCompany = $ldap{defaultCompany}; |
10 |
- our $defaultDepartment = $ldap{defaultDepartment}; |
11 |
+ our $defaultCity = $ldap{defaultCity} || '-'; |
12 |
+ our $defaultCompany = $ldap{defaultCompany} || $commonName ; |
13 |
+ our $defaultDepartment = $ldap{defaultDepartment} || '-'; |
14 |
our $email = "admin\@$DomainName"; |
15 |
our @subjectAlt = `/sbin/e-smith/generate-subjectaltnames`; |
16 |
chomp @subjectAlt; |