summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-06-25 09:44:27 -0400
committerRob Crittenden <rcritten@redhat.com>2010-07-15 11:17:58 -0400
commit18476c95384ef242923398bbf1985a002dcc87b6 (patch)
tree2996d4f506a61ee14933beabad987db691d5d02b
parent8d2d7429beb6bf66cb3c4fc35a7a3dbb165a432c (diff)
downloadfreeipa.git-18476c95384ef242923398bbf1985a002dcc87b6.tar.gz
freeipa.git-18476c95384ef242923398bbf1985a002dcc87b6.tar.xz
freeipa.git-18476c95384ef242923398bbf1985a002dcc87b6.zip
Use newer API in ipalib/x509 and add missing import.
The import was only used when running the in-tree lite-server
-rw-r--r--ipalib/x509.py1
-rw-r--r--ipaserver/plugins/selfsign.py7
2 files changed, 2 insertions, 6 deletions
diff --git a/ipalib/x509.py b/ipalib/x509.py
index bb765faa..4637e9f2 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -17,6 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+import os
import sys
import base64
import nss.nss as nss
diff --git a/ipaserver/plugins/selfsign.py b/ipaserver/plugins/selfsign.py
index 67b8efef..39d1c539 100644
--- a/ipaserver/plugins/selfsign.py
+++ b/ipaserver/plugins/selfsign.py
@@ -208,12 +208,7 @@ class ra(rabase.rabase):
try:
# Grab the subject, reverse it, combine it and return it
- sub = list(x509.get_subject_components(cert))
- sub.reverse()
- subject = ""
- for s in sub:
- subject = subject + "%s=%s," % (s[0], s[1])
- subject = subject[:-1]
+ subject = x509.get_subject(cert)
serial = x509.get_serial_number(cert)
except error.PyAsn1Error, e: