--- trac-accountmanager-svn-0.10/acct_mgr/htfile.py 2007-03-30 23:59:21.000000000 -0700 +++ /tmp/htfile.py25341nCu 2007-03-30 23:59:21.000000000 -0700 @@ -68,7 +68,7 @@ try: for line in fd: if line.startswith(prefix): - return self._check_userline(password, prefix, + return self._check_userline(user, password, prefix, line[len(prefix):].rstrip('\n')) finally: fd.close() @@ -134,7 +134,7 @@ def userline(self, user, password): return self.prefix(user) + htpasswd(password) - def _check_userline(self, password, prefix, suffix): + def _check_userline(self, user, password, prefix, suffix): return suffix == htpasswd(password, suffix) def _get_users(self, filename): @@ -172,7 +172,7 @@ def userline(self, user, password): return self.prefix(user) + htdigest(user, self.realm, password) - def _check_userline(self, password, prefix, suffix): + def _check_userline(self, user, password, prefix, suffix): return suffix == htdigest(user, self.realm, password) def _get_users(self, filename):