diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-05 15:51:11 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-05 15:51:11 -0500 |
| commit | 51c00fd6c8bd7ef703f260e7d94ac43f4294624b (patch) | |
| tree | f2eff508630a2fdb69dfe9dd8b748d2afc22710c /func/certs.py | |
| parent | 8c7114e9c59419fb1ecce075e56c34e0198b8228 (diff) | |
| download | func-51c00fd6c8bd7ef703f260e7d94ac43f4294624b.tar.gz func-51c00fd6c8bd7ef703f260e7d94ac43f4294624b.tar.xz func-51c00fd6c8bd7ef703f260e7d94ac43f4294624b.zip | |
Make hostname detection code shared.
Diffstat (limited to 'func/certs.py')
| -rw-r--r-- | func/certs.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/func/certs.py b/func/certs.py index 413f9ce..4d6bf15 100644 --- a/func/certs.py +++ b/func/certs.py @@ -17,6 +17,7 @@ from OpenSSL import crypto import socket import os +import utils def_country = 'UN' def_state = 'FC' @@ -48,12 +49,7 @@ def make_csr(pkey, dest=None, cn=None): if cn: subj.CN = cn else: - fqdn = socket.getfqdn() - host = socket.gethostname() - if fqdn.find(host) != -1: - subj.CN = fqdn - else: - subj.CN = host + subj.CN = utils.get_hostname() subj.emailAddress = 'root@%s' % subj.CN req.set_pubkey(pkey) |