summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/cainstance.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-09-28 23:10:25 -0400
committerRob Crittenden <rcritten@redhat.com>2010-10-01 13:37:34 -0400
commit3703062ab25a7817581eefa2f89214e8a6244bee (patch)
tree469a4abc1eea4dadac459e28936fe7e117e8808a /ipaserver/install/cainstance.py
parent3127df2aee8ad8ef95f34610665a004fece51acf (diff)
downloadfreeipa-3703062ab25a7817581eefa2f89214e8a6244bee.tar.gz
freeipa-3703062ab25a7817581eefa2f89214e8a6244bee.tar.xz
freeipa-3703062ab25a7817581eefa2f89214e8a6244bee.zip
Use consistent, specific nickname for the IPA CA certificate.
Also fix some imports for sha. We have a compat module for it, use it. ticket 181
Diffstat (limited to 'ipaserver/install/cainstance.py')
-rw-r--r--ipaserver/install/cainstance.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index d356ef82d..cc203d5ec 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -36,6 +36,7 @@ import urllib
import xml.dom.minidom
import stat
from ipapython import dogtag
+from ipapython.certdb import CA_NICKNAME
from ipalib import pkcs10
import subprocess
@@ -381,7 +382,7 @@ class CAInstance(service.Service):
# The same database is used for mod_nss because the NSS context
# will already have been initialized by Apache by the time
# mod_python wants to do things.
- self.canickname = "CA certificate"
+ self.canickname = CA_NICKNAME
self.basedn = "o=ipaca"
self.ca_agent_db = tempfile.mkdtemp(prefix = "tmp-")
self.ra_agent_db = "/etc/httpd/alias"