summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2013-03-06 14:28:18 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-07 09:40:21 +0100
commit80b544eb5a6dbb99620c0e196126c0d934134e7b (patch)
tree35d5b2c520676981bb226602a116dd65356a1f87 /ipaserver
parentd652758dedea5f79235b4a94a20c6dc7a7029c56 (diff)
downloadfreeipa.git-80b544eb5a6dbb99620c0e196126c0d934134e7b.tar.gz
freeipa.git-80b544eb5a6dbb99620c0e196126c0d934134e7b.tar.xz
freeipa.git-80b544eb5a6dbb99620c0e196126c0d934134e7b.zip
Don't base64-encode the CA cert when uploading it during an upgrade.
We want to store the raw value. Tools like ldapsearch will automatically base64 encode the value because it's binary so we don't want to duplicate that. https://fedorahosted.org/freeipa/ticket/3477
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/plugins/upload_cacrt.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/plugins/upload_cacrt.py b/ipaserver/install/plugins/upload_cacrt.py
index d60247b7..a82fc36b 100644
--- a/ipaserver/install/plugins/upload_cacrt.py
+++ b/ipaserver/install/plugins/upload_cacrt.py
@@ -39,7 +39,6 @@ class update_upload_cacrt(PostUpdate):
certdb = certs.CertDB(api.env.realm, nssdir=dirname, subject_base=subject_base)
dercert = certdb.get_cert_from_db(certdb.cacert_name, pem=False)
- cadercert = base64.b64encode(dercert)
updates = {}
dn = DN(('cn', 'CACert'), ('cn', 'ipa'), ('cn','etc'), api.env.basedn)
@@ -47,7 +46,7 @@ class update_upload_cacrt(PostUpdate):
cacrt_entry = ['objectclass:nsContainer',
'objectclass:pkiCA',
'cn:CAcert',
- 'cACertificate;binary:%s' % cadercert,
+ 'cACertificate;binary:%s' % dercert,
]
updates[dn] = {'dn': dn, 'default': cacrt_entry}