From e11d6fe736261030209b412c8ef063974b55555a Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Wed, 18 Mar 2020 07:18:56 -0500 Subject: [PATCH] Still better root DN password management If the environment variable OLC_ROOT_DN_PASSWORD is set but OLC_ROOT_DN (usually a hash) is not and is set to the Dockerfile default of 'password', then take OLC_ROOT_DN from OLC_ROOT_DN_PASSWORD. --- comanage-registry-slapd-base/comanage_ldap_utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comanage-registry-slapd-base/comanage_ldap_utils.sh b/comanage-registry-slapd-base/comanage_ldap_utils.sh index fef0b68..81582a7 100755 --- a/comanage-registry-slapd-base/comanage_ldap_utils.sh +++ b/comanage-registry-slapd-base/comanage_ldap_utils.sh @@ -105,7 +105,7 @@ function comanage_ldap_utils::bootstrap() { local suffix="${OLC_SUFFIX:-dc=my,dc=org}" local root_dn="${OLC_ROOT_DN:-cn=admin,dc=my,dc=org}" - if [[ -n "${OLC_ROOT_DN_PASSWORD}" && -z "${OLC_ROOT_PW}" ]]; then + if [[ -n "${OLC_ROOT_DN_PASSWORD}" && "${OLC_ROOT_PW}" = "password" ]]; then local root_pw="${OLC_ROOT_DN_PASSWORD}" else local root_pw="${OLC_ROOT_PW:-password}"