summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-02-05 15:51:11 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-02-05 15:51:11 -0500
commit51c00fd6c8bd7ef703f260e7d94ac43f4294624b (patch)
treef2eff508630a2fdb69dfe9dd8b748d2afc22710c /func
parent8c7114e9c59419fb1ecce075e56c34e0198b8228 (diff)
downloadthird_party-func-51c00fd6c8bd7ef703f260e7d94ac43f4294624b.tar.gz
third_party-func-51c00fd6c8bd7ef703f260e7d94ac43f4294624b.tar.xz
third_party-func-51c00fd6c8bd7ef703f260e7d94ac43f4294624b.zip
Make hostname detection code shared.
Diffstat (limited to 'func')
-rwxr-xr-xfunc/certmaster.py7
-rw-r--r--func/certs.py8
-rwxr-xr-xfunc/utils.py10
3 files changed, 13 insertions, 12 deletions
diff --git a/func/certmaster.py b/func/certmaster.py
index ee9c5f0..fe5dcbc 100755
--- a/func/certmaster.py
+++ b/func/certmaster.py
@@ -39,12 +39,7 @@ class CertMaster(object):
def __init__(self, conf_file=CERTMASTER_CONFIG):
self.cfg = read_config(conf_file, CMConfig)
- fqdn = socket.getfqdn()
- host = socket.gethostname()
- if fqdn.find(host) != -1:
- usename = fqdn
- else:
- usename = host
+ usename = utils.get_hostname()
mycn = '%s-CA-KEY' % usename
self.ca_key_file = '%s/funcmaster.key' % self.cfg.cadir
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)
diff --git a/func/utils.py b/func/utils.py
index 1a4abb7..54c9c39 100755
--- a/func/utils.py
+++ b/func/utils.py
@@ -15,6 +15,7 @@ import string
import sys
import traceback
import xmlrpclib
+import socket
REMOTE_ERROR = "REMOTE_ERROR"
@@ -50,6 +51,15 @@ def nice_exception(etype, evalue, etb):
nicestack = string.join(traceback.format_list(traceback.extract_tb(etb)))
return [ REMOTE_ERROR, nicetype, str(evalue), nicestack ]
+def get_hostname():
+ fqdn = socket.getfqdn()
+ host = socket.gethostname()
+ if fqdn.find(host) != -1:
+ return fqdn
+ else:
+ return host
+
+
def is_error(result):
if type(result) != list:
return False