Moving all of the client and server code into a single network/ directory. In other words, more code structure cleanup.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index 9fdb33bcf..91661e9e7 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -189,7 +189,7 @@ module Puppet
             # to create one if we don't already have one (or if we're not a CA
             # server).
             caclient = nil
-            if @driver.is_a? Puppet::Client::CA or @driver.is_a? Puppet::Server::CA
+            if @driver.is_a? Puppet::Network::Client::CA or @driver.is_a? Puppet::Network::Server::CA
                 caclient = @driver
             else
                 # Create a CA client with which to request the cert.
@@ -197,7 +197,7 @@ module Puppet
                     raise Puppet::DevError,
                         "Incorrect setup for a local CA request"
                 end
-                caclient = Puppet::Client::CA.new(
+                caclient = Puppet::Network::Client::CA.new(
                     :Port => @driver.puppet_port,
                     :Server => @driver.puppet_server
                 )