diff -r ad66d7b3fd48 -r 39b7a91a3f4c server/sources/ldapfeed.py --- a/server/sources/ldapfeed.py Mon Jul 01 16:13:17 2013 +0200 +++ b/server/sources/ldapfeed.py Thu Jan 23 12:32:16 2014 +0100 @@ -275,9 +275,9 @@ # Deny auto-chasing of referrals to be safe, we handle them instead # Required for AD try: - conn.set_option(ldap.OPT_REFERRALS, 0) + conn.set_option(ldap.OPT_REFERRALS, 0) except ldap.LDAPError: # Cannot set referrals, so do nothing - pass + pass #conn.set_option(ldap.OPT_NETWORK_TIMEOUT, conn_timeout) #conn.timeout = op_timeout # Now bind with the credentials given. Let exceptions propagate out.