Merge commit 'refs/merge-requests/9' of git://gitorious.org/radicale/radicale into merge-requests/9

2011-05-11 05:01:00 +02:00
parent 2830afd71d 485e375139
commit 7e1815cbeb
5 changed files with 51 additions and 15 deletions
--- a/radicale/acl/htpasswd.py
+++ b/radicale/acl/htpasswd.py
@@ -65,5 +65,5 @@ def has_right(owner, user, password):
        if line.strip():
            login, hash_value = line.strip().split(":")
            if login == user and (not PERSONAL or user == owner):
-                return locals()["_%s" % ENCRYPTION](hash_value, password)
+                return globals()["_%s" % ENCRYPTION](hash_value, password)
    return False