[Zope-CVS] CVS: Products/PluggableAuthService - PluggableAuthService.py:1.6.2.3

[Lennart Regebro]

Update of /cvs-repository/Products/PluggableAuthService
In directory cvs.zope.org:/tmp/cvs-serv18266

Modified Files:
      Tag: regebro-implement_challenge-branch
	PluggableAuthService.py 
Log Message:
Prevents mangling already mangled ids.


=== Products/PluggableAuthService/PluggableAuthService.py 1.6.2.2 => 1.6.2.3 ===
--- Products/PluggableAuthService/PluggableAuthService.py:1.6.2.2	Mon Aug 30 12:02:05 2004
+++ Products/PluggableAuthService/PluggableAuthService.py	Mon Aug 30 13:12:07 2004
@@ -239,7 +239,7 @@
         , name
         , value
         ) = self._getObjectContext( request[ 'PUBLISHED' ], request )
-
+        
         for user_id, login in user_ids:
 
             user = self._findUser( plugins, user_id, login
@@ -735,7 +735,6 @@
 
             if user_id is not None:
                 result.append( ( user_id, name ) )
-
         return result
 
     security.declarePrivate( '_unmangleId' )
@@ -745,7 +744,9 @@
 
     security.declarePrivate( '_mangleId' )
     def _mangleId( self, namespace, id ):
-
+    
+        if id.find(MANGLE_DELIMITER) != -1: 
+            return id 
         return MANGLE_DELIMITER.join( ( namespace, id ) )
 
     security.declarePrivate( '_computeMangledId' )