From 51c00fd6c8bd7ef703f260e7d94ac43f4294624b Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Tue, 5 Feb 2008 15:51:11 -0500
Subject: Make hostname detection code shared.

---
 func/certs.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'func/certs.py')

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)
-- 
cgit