From 08051f16516a3978494ae94032d55cc8b1426df9 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Thu, 31 Oct 2013 16:54:49 +0000
Subject: Convert remaining installer code to LDAPEntry API.

---
 install/restart_scripts/renew_ca_cert | 12 +++++++-----
 install/restart_scripts/renew_ra_cert | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'install/restart_scripts')

diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert
index da2253b4c..09acfc236 100644
--- a/install/restart_scripts/renew_ca_cert
+++ b/install/restart_scripts/renew_ca_cert
@@ -69,13 +69,15 @@ try:
     conn = ldap2(shared_instance=False, ldap_uri=api.env.ldap_uri)
     conn.connect(ccache=ccache)
     try:
-        (entry_dn, entry_attrs) = conn.get_entry(dn, ['usercertificate'])
+        entry_attrs = conn.get_entry(dn, ['usercertificate'])
         entry_attrs['usercertificate'] = cert
-        conn.update_entry(dn, entry_attrs)
+        conn.update_entry(entry_attrs)
     except errors.NotFound:
-        entry_attrs = dict(objectclass=['top', 'pkiuser', 'nscontainer'],
-                                        usercertificate=cert)
-        conn.add_entry(dn, entry_attrs)
+        entry_attrs = conn.make_entry(
+            dn,
+            objectclass=['top', 'pkiuser', 'nscontainer'],
+            usercertificate=[cert])
+        conn.add_entry(entry_attrs)
     except errors.EmptyModlist:
         pass
     conn.disconnect()
diff --git a/install/restart_scripts/renew_ra_cert b/install/restart_scripts/renew_ra_cert
index 919f8fc41..cb3e3683b 100644
--- a/install/restart_scripts/renew_ra_cert
+++ b/install/restart_scripts/renew_ra_cert
@@ -58,13 +58,15 @@ while attempts < 10:
         conn = ldap2(shared_instance=False, ldap_uri=api.env.ldap_uri)
         conn.connect(ccache=ccache)
         try:
-            (entry_dn, entry_attrs) = conn.get_entry(dn, ['usercertificate'])
+            entry_attrs = conn.get_entry(dn, ['usercertificate'])
             entry_attrs['usercertificate'] = dercert
-            conn.update_entry(dn, entry_attrs)
+            conn.update_entry(entry_attrs)
         except errors.NotFound:
-            entry_attrs = dict(objectclass=['top', 'pkiuser', 'nscontainer'],
-                                            usercertificate=dercert)
-            conn.add_entry(dn, entry_attrs)
+            entry_attrs = conn.make_entry(
+                dn,
+                objectclass=['top', 'pkiuser', 'nscontainer'],
+                usercertificate=[dercert])
+            conn.add_entry(entry_attrs)
         except errors.EmptyModlist:
             pass
         updated = True
-- 
cgit