Trying to fix #364. Somewhat used the patch provided by nslm.

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

2 files changed, 20 insertions, 3 deletions

diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 0e5954add..5d8a3a63e 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -1002,7 +1002,7 @@ module Puppet
             end
 
             # As the correct user and group
-            Puppet::SUIDManager.asuser(asuser(), self.should(:group)) do
+            write_if_writable(File.dirname(path)) do
                 f = nil
                 # Open our file with the correct modes
                 if mode
@@ -1040,6 +1040,23 @@ module Puppet
             # FIXME This is extra work, because it's going to read the whole
             # file back in again.
             self.setchecksum
+            
+        end
+        
+        # Run the block as the specified user if the dir is writeable, else
+        # run it as root (or the current user).
+        def write_if_writable(dir)
+            asroot = true
+            Puppet::SUIDManager.asuser(asuser(), self.should(:group)) do
+                if FileTest.writable?(dir)
+                    asroot = false
+                    yield
+                end
+            end
+            
+            if asroot
+                yield
+            end
         end
     end # Puppet.type(:pfile)
 
diff --git a/lib/puppet/type/pfile/ensure.rb b/lib/puppet/type/pfile/ensure.rb
index 9e1eec86d..6f8c335b1 100755
--- a/lib/puppet/type/pfile/ensure.rb
+++ b/lib/puppet/type/pfile/ensure.rb
@@ -67,7 +67,7 @@ module Puppet
                     "Cannot create %s; parent directory %s does not exist" %
                         [@parent[:path], parent]
             end
-            Puppet::SUIDManager.asuser(@parent.asuser()) {
+            @parent.write_if_writable(parent) do
                 if mode
                     Puppet::Util.withumask(000) do
                         Dir.mkdir(@parent[:path],mode)
@@ -75,7 +75,7 @@ module Puppet
                 else
                     Dir.mkdir(@parent[:path])
                 end
-            }
+            end
             @parent.setchecksum
             return :directory_created
         end