changeset 3666:479067b42c67

No new code commited
author MelitaMihaljevic <melita.mihaljevic@gmail.com>
date Thu, 05 Jun 2008 00:01:45 +0200
parents bb58eec045b1
children 4e59423375ce
files MoinMoin/auth/ldap_login.py docs/CHANGES
diffstat 2 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/auth/ldap_login.py	Tue Jun 03 16:20:04 2008 +0200
+++ b/MoinMoin/auth/ldap_login.py	Thu Jun 05 00:01:45 2008 +0200
@@ -173,7 +173,6 @@
                 # logging.debug("veliki moji problemi sa .")
                 # raise
                 # we remove entries with dn == None to get the real result list:
-<<<<<<< /home/gizmo/moin-1.7/MoinMoin/auth/ldap_login.py.orig.
                 # lusers = [(dn, ldap_dict) for dn, ldap_dict in lusers if dn is not None]
                 # for dn, ldap_dict in lusers:
                 #    logging.debug("dn:%r" % dn)
@@ -188,7 +187,6 @@
                 if result_length == 0:
                     logging.debug("Search found no matches for %r." % (filterstr, ))
                     return CancelLogin(_("Invalid username or password."))
-||||||| /tmp/ldap_login.py~base.fraYxV
                 lusers = [(dn, ldap_dict) for dn, ldap_dict in lusers if dn is not None]
                 for dn, ldap_dict in lusers:
                     logging.debug("dn:%r" % dn)
@@ -202,7 +200,6 @@
                     if result_length == 0:
                         logging.debug("Search found no matches for %r." % (filterstr, ))
                     return CancelLogin(_("Invalid username or password."))
-=======
                 lusers = [(dn, ldap_dict) for dn, ldap_dict in lusers if dn is not None]
                 for dn, ldap_dict in lusers:
                     logging.debug("dn:%r" % dn)
@@ -216,9 +213,7 @@
                     if result_length == 0:
                         logging.debug("Search found no matches for %r." % (filterstr, ))
                     return ContinueLogin(user_obj, _("Invalid username or password."))
->>>>>>> /tmp/ldap_login.py~other.ikLnu4
 
-<<<<<<< /home/gizmo/moin-1.7/MoinMoin/auth/ldap_login.py.orig.
                 #dn, ldap_dict = lusers[0]
                 #if not self.bind_once:
                 #    logging.debug("DN found is %r, trying to bind with pw" % dn)
@@ -256,7 +251,6 @@
                 # u.aliasname = aliasname
                 # u.remember_me = 0 # 0 enforces cookie_lifetime config param
                 # logging.debug("creating userprefs with name %r email %r alias %r" % (username, email, aliasname))
-||||||| /tmp/ldap_login.py~base.fraYxV
                 dn, ldap_dict = lusers[0]
                 if not self.bind_once:
                     logging.debug("DN found is %r, trying to bind with pw" % dn)
@@ -294,7 +288,6 @@
                 u.aliasname = aliasname
                 u.remember_me = 0 # 0 enforces cookie_lifetime config param
                 logging.debug("creating userprefs with name %r email %r alias %r" % (username, email, aliasname))
-=======
                 dn, ldap_dict = lusers[0]
                 if not self.bind_once:
                     logging.debug("DN found is %r, trying to bind with pw" % dn)
@@ -332,7 +325,6 @@
                 u.aliasname = aliasname
                 u.remember_me = 0 # 0 enforces cookie_lifetime config param
                 logging.debug("creating userprefs with name %r email %r alias %r" % (username, email, aliasname))
->>>>>>> /tmp/ldap_login.py~other.ikLnu4
 
             except ldap.INVALID_CREDENTIALS, err:
                 logging.debug("invalid credentials (wrong password?) for dn %r (username: %r)" % (dn, username))
--- a/docs/CHANGES	Tue Jun 03 16:20:04 2008 +0200
+++ b/docs/CHANGES	Thu Jun 05 00:01:45 2008 +0200
@@ -26,6 +26,11 @@
     having made a backup with some other, proven method.
     USE BOTH ON YOUR OWN RISK!
 
+Version 1.8-ldapgroups-mmihaljevic
+   Developer notes (these should be moved to the end in the release):
+    * done ldap_login testing - still got skiped tests 
+    * read about python-ldap and searchiing ldap groups - done some coding but not finished functionality  
+
 
 Version 1.7.0current: