Merge 1.5.0 changes back to master.

This commit is contained in:
Virtually Nick
2022-04-09 13:56:14 -04:00

View File

@@ -1046,7 +1046,7 @@ if [ -n "$OPENID_AUTHORIZATION_ENDPOINT" ]; then
fi
# Use SAML if specified
if [ -n "$SAML_IDP_METADATA_URL" ]; then
if [ -n "$SAML_IDP_METADATA_URL" ] || [ -n "$SAML_ENTITY_ID" -a -n "$SAML_CALLBACK_URL" ]; then
associate_saml
INSTALLED_AUTH="$INSTALLED_AUTH saml"
fi