# HG changeset patch # User Sylvain Thénault # Date 1249492330 -7200 # Node ID 15ffc3c8923c064b098c025f88cfb93ce0dcc865 # Parent 09baf5175196d3f49a9ebc7226d38bc7f41f0b0d cleanup diff -r 09baf5175196 -r 15ffc3c8923c server/sources/ldapuser.py --- a/server/sources/ldapuser.py Wed Aug 05 18:56:22 2009 +0200 +++ b/server/sources/ldapuser.py Wed Aug 05 19:12:10 2009 +0200 @@ -446,20 +446,20 @@ def _auth_cram_md5(self, conn, user, userpwd): from ldap import sasl auth_token = sasl.cram_md5(user['dn'], userpwd) - conn.sasl_interactive_bind_s("", auth_tokens) + conn.sasl_interactive_bind_s('', auth_tokens) def _auth_digest_md5(self, conn, user, userpwd): from ldap import sasl auth_token = sasl.digest_md5(user['dn'], userpwd) - conn.sasl_interactive_bind_s("", auth_tokens) + conn.sasl_interactive_bind_s('', auth_tokens) def _auth_gssapi(self, conn, user, userpwd): # print XXX not proper sasl/gssapi - from ldap import sasl import kerberos if not kerberos.checkPassword(user[self.user_login_attr], userpwd): raise Exception('BAD login / mdp') - #conn.sasl_interactive_bind_s("", auth_tokens) + #from ldap import sasl + #conn.sasl_interactive_bind_s('', sasl.gssapi()) def _search(self, session, base, scope, searchstr='(objectClass=*)', attrs=()):