Applying a variant on Brenton's patch for DNS issues.

2 files changed, 15 insertions, 2 deletions

diff --git a/func/certmaster.py b/func/certmaster.py
index 1cde806..fdb34b8 100755
--- a/func/certmaster.py
+++ b/func/certmaster.py
@@ -36,7 +36,15 @@ CERTMASTER_LISTEN_PORT = 51235
 class CertMaster(object):
     def __init__(self, conf_file):
         self.cfg = read_config(conf_file, CMConfig)
-        mycn = '%s-CA-KEY' % socket.getfqdn()
+
+        fqdn = socket.getfqdn()
+        host = socket.gethostname()
+        if fdqn.find(host) != -1:
+            usename = fqdn
+        else: 
+            usename = host
+
+        mycn = '%s-CA-KEY' % usename
         self.ca_key_file = '%s/funcmaster.key' % self.cfg.cadir
         self.ca_cert_file = '%s/funcmaster.crt' % self.cfg.cadir
         try:
diff --git a/func/certs.py b/func/certs.py
index 22af866..810d17c 100644
--- a/func/certs.py
+++ b/func/certs.py
@@ -48,7 +48,12 @@ def make_csr(pkey, dest=None, cn=None):
     if cn:
         subj.CN = cn
     else:
-        subj.CN = socket.getfqdn()
+        fqdn = socket.getfqdn()
+        host = socket.gethostname()
+        if fdqn.find(host) != -1:        
+            subj.CN = fqdn
+        else: 
+            subj.CN = host
     subj.emailAddress = 'root@%s' % subj.CN       
         
     req.set_pubkey(pkey)