This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 6e439bf827ef4ec60a5095d32b20fb90e47d262d Merge: 51b1c08 2d86bbf Author: Michael Jumper <[email protected]> AuthorDate: Sun Aug 11 15:54:36 2019 -0700 Merge 1.1.0 changes back to master. extensions/guacamole-auth-ldap/pom.xml | 14 +- .../guacamole-auth-ldap/src/licenses/LICENSE | 23 +-- .../directory-api-2.0.0/LICENSE-2.0.txt} | 51 ----- .../src/licenses/bundled/jldap-4.3/LICENSE | 47 ----- .../src/licenses/bundled/jldap-4.3/LICENSE-2.0.1 | 56 ----- .../auth/ldap/AuthenticationProviderService.java | 179 ++++++---------- .../auth/ldap/DereferenceAliasesMode.java | 74 ------- .../guacamole/auth/ldap/EscapingService.java | 120 ----------- .../ldap/LDAPAuthenticationProviderModule.java | 2 +- .../guacamole/auth/ldap/LDAPConnectionService.java | 230 ++++++++++++++------- .../guacamole/auth/ldap/ObjectQueryService.java | 156 +++++++------- .../guacamole/auth/ldap/ReferralAuthHandler.java | 79 ------- .../auth/ldap/{ => conf}/ConfigurationService.java | 63 ++---- .../{ => conf}/DereferenceAliasesProperty.java | 21 +- .../auth/ldap/{ => conf}/EncryptionMethod.java | 2 +- .../ldap/{ => conf}/EncryptionMethodProperty.java | 2 +- .../ldap/{ => conf}/LDAPGuacamoleProperties.java | 56 +++-- .../LdapDnGuacamoleProperty.java} | 38 ++-- .../LdapFilterGuacamoleProperty.java} | 39 ++-- .../auth/ldap/{ => conf}/StringListProperty.java | 2 +- .../auth/ldap/connection/ConnectionService.java | 127 +++++++----- .../auth/ldap/group/UserGroupService.java | 76 ++++--- .../auth/ldap/user/LDAPAuthenticatedUser.java | 25 ++- .../guacamole/auth/ldap/user/LDAPUserContext.java | 13 +- .../guacamole/auth/ldap/user/UserService.java | 65 +++--- 25 files changed, 607 insertions(+), 953 deletions(-)
