Merging r1468 from the implementations branch with r1438 from when the branch was first created.

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

1 files changed, 18 insertions, 3 deletions

diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb
index 9ee0d55d8..cf522a994 100644
--- a/lib/puppet/client.rb
+++ b/lib/puppet/client.rb
@@ -26,9 +26,15 @@ module Puppet
 
         def initcerts
             unless self.readcert
-                unless self.requestcert
-                    return nil
-                end
+                #if self.is_a? Puppet::Client::CA
+                    unless self.requestcert
+                        return nil
+                    end
+                #else
+                #    return nil
+                #end
+                #unless self.requestcert
+                #end
             end
 
             # unless we have a driver, we're a local client and we can't add
@@ -95,6 +101,15 @@ module Puppet
             end
         end
 
+        # Are we a local client?
+        def local?
+            if defined? @local and @local
+                true
+            else
+                false
+            end
+        end
+
         # A wrapper method to run and then store the last run time
         def runnow
             if self.stopping