[Zodb-checkins] CVS: ZODB3/ZEO/auth - base.py:1.2.6.2

[Christian Reis]

Update of /cvs-repository/ZODB3/ZEO/auth
In directory cvs.zope.org:/tmp/cvs-serv17673/auth

Modified Files:
      Tag: Zope-2_7-branch
	base.py 
Log Message:
Backporting zeopasswd fix from HEAD; make the file work as a script, and
allow specifying the authentication database via commandline parameters.
Extra fixes thrown in for free.


=== ZODB3/ZEO/auth/base.py 1.2.6.1 => 1.2.6.2 ===
--- ZODB3/ZEO/auth/base.py:1.2.6.1	Mon Sep 15 17:26:53 2003
+++ ZODB3/ZEO/auth/base.py	Thu Dec 18 21:08:43 2003
@@ -59,8 +59,12 @@
         """
         self._users = {}
         self.filename = filename
-        self.realm = realm
         self.load()
+        if self.realm and self.realm != realm:
+            raise ValueError, ("Specified realm %r differs from "
+                               "database realm %r" % (realm or '', self.realm))
+        else:
+            self.realm = realm
 
     def save(self, fd=None):
         filename = self.filename