summaryrefslogtreecommitdiffstats
path: root/daemons
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2015-08-31 18:40:50 +0200
committerMartin Basti <mbasti@redhat.com>2015-09-03 18:20:36 +0200
commite84006117637832f63904edeb45b7296151be6ad (patch)
tree2bf8c6be1d1223e871c3f90cfa28de4fd4ec7db5 /daemons
parent025a9b16c8e223a6e752f84f7619cff57ab2549e (diff)
downloadfreeipa-e84006117637832f63904edeb45b7296151be6ad.tar.gz
freeipa-e84006117637832f63904edeb45b7296151be6ad.tar.xz
freeipa-e84006117637832f63904edeb45b7296151be6ad.zip
DNSSEC: Fix key metadata export
Incorrect SQL join condition could lead to situation where metadata from ZSK and KSK were interchanged. https://fedorahosted.org/freeipa/ticket/5273 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Oleg Fayans <ofayans@redhat.com>
Diffstat (limited to 'daemons')
-rwxr-xr-xdaemons/dnssec/ipa-ods-exporter2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemons/dnssec/ipa-ods-exporter b/daemons/dnssec/ipa-ods-exporter
index 7838340c3..d8c84b7ce 100755
--- a/daemons/dnssec/ipa-ods-exporter
+++ b/daemons/dnssec/ipa-ods-exporter
@@ -175,7 +175,7 @@ def get_ods_keys(zone_name):
# get all keys for given zone ID
cur = db.execute("SELECT kp.HSMkey_id, kp.generate, kp.algorithm, dnsk.publish, dnsk.active, dnsk.retire, dnsk.dead, dnsk.keytype "
- "FROM keypairs AS kp JOIN dnsseckeys AS dnsk ON kp.id = dnsk.id "
+ "FROM keypairs AS kp JOIN dnsseckeys AS dnsk ON kp.id = dnsk.keypair_id "
"WHERE dnsk.zone_id = ?", (zone_id,))
keys = {}
for row in cur: