|
 |
590d18 |
From b250ac5d752b3565b4fdfb74e8de38784ba93d89 Mon Sep 17 00:00:00 2001
|
|
|
590d18 |
From: Petr Spacek <pspacek@redhat.com>
|
|
|
590d18 |
Date: Mon, 31 Aug 2015 18:40:50 +0200
|
|
|
590d18 |
Subject: [PATCH] DNSSEC: Fix key metadata export
|
|
|
590d18 |
|
|
|
590d18 |
Incorrect SQL join condition could lead to situation where metadata from
|
|
|
590d18 |
ZSK and KSK were interchanged.
|
|
|
590d18 |
|
|
|
590d18 |
https://fedorahosted.org/freeipa/ticket/5273
|
|
|
590d18 |
|
|
|
590d18 |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
590d18 |
Reviewed-By: Oleg Fayans <ofayans@redhat.com>
|
|
|
590d18 |
---
|
|
|
590d18 |
daemons/dnssec/ipa-ods-exporter | 2 +-
|
|
|
590d18 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
590d18 |
|
|
|
590d18 |
diff --git a/daemons/dnssec/ipa-ods-exporter b/daemons/dnssec/ipa-ods-exporter
|
|
|
590d18 |
index 76c7e484c65888b3d722448ee669ca8d95e3f3d9..e0c88936d5983297483c504d422c8d1ee483b6cf 100755
|
|
|
590d18 |
--- a/daemons/dnssec/ipa-ods-exporter
|
|
|
590d18 |
+++ b/daemons/dnssec/ipa-ods-exporter
|
|
|
590d18 |
@@ -174,7 +174,7 @@ def get_ods_keys(zone_name):
|
|
|
590d18 |
|
|
|
590d18 |
# get all keys for given zone ID
|
|
|
590d18 |
cur = db.execute("SELECT kp.HSMkey_id, kp.generate, kp.algorithm, dnsk.publish, dnsk.active, dnsk.retire, dnsk.dead, dnsk.keytype "
|
|
|
590d18 |
- "FROM keypairs AS kp JOIN dnsseckeys AS dnsk ON kp.id = dnsk.id "
|
|
|
590d18 |
+ "FROM keypairs AS kp JOIN dnsseckeys AS dnsk ON kp.id = dnsk.keypair_id "
|
|
|
590d18 |
"WHERE dnsk.zone_id = ?", (zone_id,))
|
|
|
590d18 |
keys = {}
|
|
|
590d18 |
for row in cur:
|
|
|
590d18 |
--
|
|
|
590d18 |
2.5.1
|
|
|
590d18 |
|