diff options
| -rw-r--r-- | Mailman/SecurityManager.py | 7 | ||||
| -rw-r--r-- | modules/mm_security.py | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Mailman/SecurityManager.py b/Mailman/SecurityManager.py index 83e27d009..0202baba9 100644 --- a/Mailman/SecurityManager.py +++ b/Mailman/SecurityManager.py @@ -43,8 +43,11 @@ class SecurityManager: return 1 if not user in self.members and not user in self.digest_members: user = self.FindUser(user) - if string.lower(pw) <> string.lower(self.passwords[user]): - raise mm_err.MMBadPasswordError + try: + if string.lower(pw) <> string.lower(self.passwords[user]): + raise mm_err.MMBadPasswordError + except KeyError: + raise mm_err.MMBadUserError return 1 def ChangeUserPassword(self, user, newpw, confirm): diff --git a/modules/mm_security.py b/modules/mm_security.py index 83e27d009..0202baba9 100644 --- a/modules/mm_security.py +++ b/modules/mm_security.py @@ -43,8 +43,11 @@ class SecurityManager: return 1 if not user in self.members and not user in self.digest_members: user = self.FindUser(user) - if string.lower(pw) <> string.lower(self.passwords[user]): - raise mm_err.MMBadPasswordError + try: + if string.lower(pw) <> string.lower(self.passwords[user]): + raise mm_err.MMBadPasswordError + except KeyError: + raise mm_err.MMBadUserError return 1 def ChangeUserPassword(self, user, newpw, confirm): |