Only setting group or owner on config files when running as root

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

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/puppet/config.rb b/lib/puppet/config.rb
index ab1203221..b0aa93839 100644
--- a/lib/puppet/config.rb
+++ b/lib/puppet/config.rb
@@ -685,14 +685,19 @@ Generated on #{Time.now}.
             if type == :directory or self.create
                 obj[:ensure] = type
             end
-            [:group, :mode].each { |var|
+            [:mode].each { |var|
                 if value = self.send(var)
                     obj[var] = value
                 end
             }
 
-            if Process.uid == 0 and value = self.send(:owner)
-                obj[:owner] = value
+            # Only chown or chgrp when root
+            if Process.uid == 0
+                [:group, :owner].each { |var|
+                    if value = self.send(var)
+                        obj[var] = value
+                    end
+                }
             end
 
             # And set the loglevel to debug for everything