tweak the (already applied) patch in 388cf7c3df7ce26e953949ed6fe63d76cbbb3691 to resolve #1137; also, add tests which detect the problem.

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 3e004046e..dabfaca50 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -81,9 +81,9 @@ class Puppet::Network::Handler
             clientip = facts["ipaddress"]
             if Puppet[:node_name] == 'cert'
                 if name
+                    client = name
                     facts["fqdn"] = client
                     facts["hostname"], facts["domain"] = client.split('.', 2)
-                    client = name
                 end
                 if ip
                     clientip = ip
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index 88bfe6b7e..55522237b 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -90,11 +90,15 @@ class TestMaster < Test::Unit::TestCase
         resname, resip = master.send(:clientname, nil, nil, facts)
         assert_equal(facts["hostname"], resname, "Did not use fact hostname when no certname was present")
         assert_equal(facts["ipaddress"], resip, "Did not use fact ip when no certname was present")
+        assert_equal(facts["domain"], "fact_domain", "Did not use fact domain when no certname was present")
+        assert_equal(facts["fqdn"], "fact_hostname.fact_domain", "Did not use fact fqdn when no certname was present")
 
         # Now try it with the cert stuff present
         resname, resip = master.send(:clientname, certname, certip, facts)
         assert_equal(certname, resname, "Did not use cert hostname when certname was present")
         assert_equal(certip, resip, "Did not use cert ip when certname was present")
+        assert_equal(facts["domain"], certdomain, "Did not use cert domain when certname was present")
+        assert_equal(facts["fqdn"], certname, "Did not use cert fqdn when certname was present")
 
         # And reset the node_name stuff and make sure we use it.
         Puppet[:node_name] = :facter