Another intermediate commit. Most of the graphing work itself is now done, but I am in the middle of converting files to use the graphs and at the same time am writing some actually decent tests for the file recursion stuff.

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

1 files changed, 9 insertions, 8 deletions

diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index 8033fac5b..53c60cdbe 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -126,6 +126,10 @@ class Server
                 sub.join("\t")
             }.join("\n")
         end
+        
+        def local?
+            self.local
+        end
 
         # Mount a new directory with a name.
         def mount(path, name)
@@ -188,6 +192,11 @@ class Server
         private
 
         def authcheck(file, mount, client, clientip)
+            # If we're local, don't bother passing in information.
+            if local?
+                client = nil
+                clientip = nil
+            end
             unless mount.allowed?(client, clientip)
                 mount.warning "%s cannot access %s" %
                     [client, file]
@@ -482,12 +491,6 @@ class Server
                     @path = nil
                 end
 
-                @comp = Puppet.type(:component).create(
-                    :name => "mount[#{name}]"
-                )
-                #@comp.type = "mount"
-                #@comp.name = name
-
                 super()
             end
 
@@ -504,8 +507,6 @@ class Server
                         :name => path,
                         :check => CHECKPARAMS
                     )
-
-                    @comp.push(obj)
                 end
 
                 if links == :manage