Comment 1 for bug 650114

with this patch, I merged the previous 'clear-text' feature and the failover
if the pwd is None to the manager account

------
Index: LDAPUserFolder.py
===================================================================
RCS file: /cvs-repository/Products/LDAPUserFolder/LDAPUserFolder.py,v
retrieving revision 1.88
diff -r1.88 LDAPUserFolder.py
250a251,259
> # XXX Is this really working ?
> # XXX If the pwd provided is None, then connect with manager info
> if pwd == None:
> connect_dn = bind_dn
> connect_pwd = bind_pwd
> else:
> connect_dn = dn
> connect_pwd = pwd
>
253c262
< msg = '_lookupuser: Re-binding as "%s:%s"' % (dn, pwd)
---
> msg = '_lookupuser: Re-binding as "%s:%s"' % (connect_dn,
connect_pwd)
260,261c269,270
< , bind_dn=dn
< , bind_pwd=pwd or ''
---
> , bind_dn=connect_dn
> , bind_pwd=connect_pwd or ''
265c274
< msg = '_lookupuser: "%s" lookup fails bound as "%s"' %
(dn, dn)
---
> msg = '_lookupuser: "%s" lookup fails bound as "%s"' %
(connect_dn, connect_dn)
268c277
<
---
>
1397c1406
< return ('SHA', 'SSHA')
---
> return ('clear', 'SHA', 'SSHA')
1399c1408
< return ('crypt', 'SHA', 'SSHA')
---
> return ('clear', 'crypt', 'SHA', 'SSHA')
Index: utils.py
===================================================================
RCS file: /cvs-repository/Products/LDAPUserFolder/utils.py,v
retrieving revision 1.11
diff -r1.11 utils.py
72a73,74
> elif encoding == 'clear':
> pwd_str = password