summaryrefslogtreecommitdiffstats
path: root/daemons
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-10-21 09:09:08 +0200
committerMartin Kosek <mkosek@redhat.com>2014-10-21 12:23:39 +0200
commit2a4ba3d3cc5660b4dd377708ab80e5724277e032 (patch)
treea1610550dba7831fcdd579206499ec0318cae377 /daemons
parent10725033c66cfd89340dcc95085cf1daaa18b4c0 (diff)
downloadfreeipa-2a4ba3d3cc5660b4dd377708ab80e5724277e032.tar.gz
freeipa-2a4ba3d3cc5660b4dd377708ab80e5724277e032.tar.xz
freeipa-2a4ba3d3cc5660b4dd377708ab80e5724277e032.zip
DNSSEC: remove container_dnssec_keys
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'daemons')
-rwxr-xr-xdaemons/dnssec/ipa-dnskeysync-replica3
-rwxr-xr-xdaemons/dnssec/ipa-ods-exporter3
2 files changed, 4 insertions, 2 deletions
diff --git a/daemons/dnssec/ipa-dnskeysync-replica b/daemons/dnssec/ipa-dnskeysync-replica
index 4d3e660d7..23c95a01c 100755
--- a/daemons/dnssec/ipa-dnskeysync-replica
+++ b/daemons/dnssec/ipa-dnskeysync-replica
@@ -152,7 +152,8 @@ log.debug('Connected')
### DNSSEC master: key synchronization
ldapkeydb = LdapKeyDB(log, ldap,
- DN(ipalib.api.env.container_dnssec_keys, ipalib.api.env.basedn))
+ DN(('cn', 'keys'), ('cn', 'sec'), ipalib.api.env.container_dns,
+ ipalib.api.env.basedn))
# TODO: slot number could be configurable
localhsm = LocalHSM(paths.LIBSOFTHSM2_SO, 0,
diff --git a/daemons/dnssec/ipa-ods-exporter b/daemons/dnssec/ipa-ods-exporter
index 4ae0d99b5..228589151 100755
--- a/daemons/dnssec/ipa-ods-exporter
+++ b/daemons/dnssec/ipa-ods-exporter
@@ -412,7 +412,8 @@ log.debug('Connected')
### DNSSEC master: key synchronization
-ldapkeydb = LdapKeyDB(log, ldap, DN(ipalib.api.env.container_dnssec_keys,
+ldapkeydb = LdapKeyDB(log, ldap, DN(('cn', 'keys'), ('cn', 'sec'),
+ ipalib.api.env.container_dns,
ipalib.api.env.basedn))
localhsm = LocalHSM(paths.LIBSOFTHSM2_SO, 0,
open(paths.DNSSEC_SOFTHSM_PIN).read())