X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Facl.py;h=a6fdddd953c041d13bd74a348bc9aec3fb7d8975;hb=245c6549dbacaeab5ee36ec74372b1df8675b477;hp=10a6372946177ecc6f113ed3c44a1f24eea75750;hpb=4492566896fd8a44d9b2f98799607ac7fa941440;p=dak.git

diff --git a/dak/acl.py b/dak/acl.py
index 10a63729..a6fdddd9 100644
--- a/dak/acl.py
+++ b/dak/acl.py
@@ -55,7 +55,7 @@ def get_fingerprint(entry, session):
     @return: fingerprint for the entry
     """
     field, value = entry.split(":", 1)
-    q = session.query(Fingerprint)
+    q = session.query(Fingerprint).join(Fingerprint.keyring).filter(Keyring.active == True)
 
     if field == 'uid':
         q = q.join(Fingerprint.uid).filter(Uid.uid == value)
@@ -64,7 +64,7 @@ def get_fingerprint(entry, session):
     elif field == 'fpr':
         q = q.filter(Fingerprint.fingerprint == value)
     elif field == 'keyring':
-        q = q.join(Fingerprint.keyring).filter(Keyring.keyring_name == value)
+        q = q.filter(Keyring.keyring_name == value)
     else:
         raise Exception('Unknown selector "{0}".'.format(field))