Branch: refs/heads/release_15.05 Home: https://github.com/galaxyproject/galaxy Commit: d9d365b36e827adf859759fd41113a74204ce376 https://github.com/galaxyproject/galaxy/commit/d9d365b36e827adf859759fd41113... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M lib/galaxy/auth/providers/ldap_ad.py Log Message: ----------- Fix wrong call to LDAPObject.result() by using search_ext_s(). result() second parameter is 'all', which should be 0 or 1. result() call was passing 60 as second parameter, which was probably intended to be a timeout (third parameter). By using search_ext_s(), the search() and result() calls are combined in one and the number of search results retrieved is limited to 1. Also, if the search return no results, this is now logged separately at warning level. Commit: 15b5a336c4c09524bacdc445ad47ce8a0be60168 https://github.com/galaxyproject/galaxy/commit/15b5a336c4c09524bacdc445ad47c... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M lib/galaxy/auth/providers/ldap_ad.py Log Message: ----------- Merge pull request #590 from nsoranzo/release_15.05 [15.05] Fix wrong call to LDAPObject.result() by using search_ext_s(). Compare: https://github.com/galaxyproject/galaxy/compare/395e103ee5ff...15b5a336c4c0