summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/settings
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-07-07 17:13:19 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-07 17:13:19 -0700
commit70af43f915110b806dc156fd09c3aa8ec7b0fe0d (patch)
treeed7e69aa9db0d58f523bf299d1f60e8896699fc7 /lib/puppet/util/settings
parent2c88884f892a869b4111739c2c5ff40994e5ed87 (diff)
downloadpuppet-70af43f915110b806dc156fd09c3aa8ec7b0fe0d.tar.gz
puppet-70af43f915110b806dc156fd09c3aa8ec7b0fe0d.tar.xz
puppet-70af43f915110b806dc156fd09c3aa8ec7b0fe0d.zip
Fix for #4167 -- overriding file permissions in conf file
The logic which iterates over the searchpath in reverse does not translate the name. Therefore file overrides in :master or :agent are not picked up.
Diffstat (limited to 'lib/puppet/util/settings')
-rw-r--r--lib/puppet/util/settings/file_setting.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb
index 732af0b09..6f0f315eb 100644
--- a/lib/puppet/util/settings/file_setting.rb
+++ b/lib/puppet/util/settings/file_setting.rb
@@ -3,7 +3,7 @@ require 'puppet/util/settings/setting'
# A file.
class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
AllowedOwners = %w{root service}
- AllowedGroups = %w{service}
+ AllowedGroups = %w{root service}
class SettingError < StandardError; end