Applying patch my emerose to fix #652.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2729 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 4 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 834a1e44c..5111794f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+    Fixed #652, thanks to a patch by emerose; --fqdn again
+    works with puppetd.
+
     Added an extra check to the Mongrel support so that
     Apache can be used with optional cert checking, instead
     of mandatory, thus allowing Mongrel to function as the CA.
diff --git a/bin/puppetd b/bin/puppetd
index be35dd3da..848a05b20 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -295,6 +295,7 @@ end
 args[:Server] = Puppet[:server]
 if options[:fqdn]
     args[:FQDN] = options[:fqdn]
+    Puppet[:certname] = options[:fqdn] 
 end
 
 if options[:centrallogs]