From 4ba33dcbc0c05a067cdbe3eca22667b52babc591 Mon Sep 17 00:00:00 2001 From: Erwan Date: Mon, 3 Aug 2020 20:32:52 +0200 Subject: [PATCH] GUACAMOLE-1147: Add all ldap attributes from the doc --- guacamole-docker/bin/start.sh | 48 ++++++++++++++--------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh index 6829e9589..5123a8ac4 100755 --- a/guacamole-docker/bin/start.sh +++ b/guacamole-docker/bin/start.sh @@ -421,36 +421,26 @@ END fi # Update config file - set_property "ldap-hostname" "$LDAP_HOSTNAME" - set_optional_property "ldap-port" "$LDAP_PORT" - set_optional_property "ldap-encryption-method" "$LDAP_ENCRYPTION_METHOD" - set_optional_property "ldap-max-search-results" "$LDAP_MAX_SEARCH_RESULTS" - set_optional_property "ldap-search-bind-dn" "$LDAP_SEARCH_BIND_DN" - set_optional_property "ldap-user-attributes" "$LDAP_USER_ATTRIBUTES" + set_property "ldap-hostname" "$LDAP_HOSTNAME" + set_property "ldap-user-base-dn" "$LDAP_USER_BASE_DN" - set_optional_property \ - "ldap-search-bind-password" \ - "$LDAP_SEARCH_BIND_PASSWORD" - - set_property "ldap-user-base-dn" "$LDAP_USER_BASE_DN" - set_optional_property "ldap-username-attribute" "$LDAP_USERNAME_ATTRIBUTE" - set_optional_property "ldap-member-attribute" "$LDAP_MEMBER_ATTRIBUTE" - set_optional_property "ldap-user-search-filter" "$LDAP_USER_SEARCH_FILTER" - set_optional_property "ldap-config-base-dn" "$LDAP_CONFIG_BASE_DN" - set_optional_property "ldap-group-base-dn" "$LDAP_GROUP_BASE_DN" - set_optional_property "ldap-member-attribute-type" "$LDAP_MEMBER_ATTRIBUTE_TYPE" - - set_optional_property \ - "ldap-group-name-attribute" \ - "$LDAP_GROUP_NAME_ATTRIBUTE" - - set_optional_property \ - "ldap-dereference-aliases" \ - "$LDAP_DEREFERENCE_ALIASES" - - set_optional_property "ldap-follow-referrals" "$LDAP_FOLLOW_REFERRALS" - set_optional_property "ldap-max-referral-hops" "$LDAP_MAX_REFERRAL_HOPS" - set_optional_property "ldap-operation-timeout" "$LDAP_OPERATION_TIMEOUT" + set_optional_property "ldap-port" "$LDAP_PORT" + set_optional_property "ldap-encryption-method" "$LDAP_ENCRYPTION_METHOD" + set_optional_property "ldap-max-search-results" "$LDAP_MAX_SEARCH_RESULTS" + set_optional_property "ldap-search-bind-dn" "$LDAP_SEARCH_BIND_DN" + set_optional_property "ldap-user-attributes" "$LDAP_USER_ATTRIBUTES" + set_optional_property "ldap-search-bind-password" "$LDAP_SEARCH_BIND_PASSWORD" + set_optional_property "ldap-username-attribute" "$LDAP_USERNAME_ATTRIBUTE" + set_optional_property "ldap-member-attribute" "$LDAP_MEMBER_ATTRIBUTE" + set_optional_property "ldap-user-search-filter" "$LDAP_USER_SEARCH_FILTER" + set_optional_property "ldap-config-base-dn" "$LDAP_CONFIG_BASE_DN" + set_optional_property "ldap-group-base-dn" "$LDAP_GROUP_BASE_DN" + set_optional_property "ldap-member-attribute-type" "$LDAP_MEMBER_ATTRIBUTE_TYPE" + set_optional_property "ldap-group-name-attribute" "$LDAP_GROUP_NAME_ATTRIBUTE" + set_optional_property "ldap-dereference-aliases" "$LDAP_DEREFERENCE_ALIASES" + set_optional_property "ldap-follow-referrals" "$LDAP_FOLLOW_REFERRALS" + set_optional_property "ldap-max-referral-hops" "$LDAP_MAX_REFERRAL_HOPS" + set_optional_property "ldap-operation-timeout" "$LDAP_OPERATION_TIMEOUT" # Add required .jar files to GUACAMOLE_EXT ln -s /opt/guacamole/ldap/guacamole-auth-*.jar "$GUACAMOLE_EXT"