summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application/master.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-05-12 18:26:43 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit37a55306aa08e2004103e9a4a2a94bba18ffa61d (patch)
tree0e8fd85505a8bfa17b08611ce160211420339cfa /lib/puppet/application/master.rb
parentac7efc8f0284d6b35f5428da06ba371cf94998ec (diff)
downloadpuppet-37a55306aa08e2004103e9a4a2a94bba18ffa61d.tar.gz
puppet-37a55306aa08e2004103e9a4a2a94bba18ffa61d.tar.xz
puppet-37a55306aa08e2004103e9a4a2a94bba18ffa61d.zip
Feature #2935 Modes: root? predicate
Use a predicate method to check if we're running as root, rather than comparing the effective user id Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet/application/master.rb')
-rw-r--r--lib/puppet/application/master.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 433a4d2f2..5d597a69b 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -95,7 +95,7 @@ class Puppet::Application::Master < Puppet::Application
Puppet::SSL::Host.ca_location = :only
end
- if Process.uid == 0
+ if Puppet.features.root?
begin
Puppet::Util.chuser
rescue => detail