diff options
author | David Schmitt <david@dasz.at> | 2010-05-14 11:07:19 +0200 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | bbba9f9f52b71c0402a297b3d738aee0cc75b348 (patch) | |
tree | 6cb08ecabb47d2ad9b2ad6926a8d1053139859a3 | |
parent | a90bcb08c3dc0a3c777f8a6c7d75cb6533a8804d (diff) | |
download | puppet-bbba9f9f52b71c0402a297b3d738aee0cc75b348.tar.gz puppet-bbba9f9f52b71c0402a297b3d738aee0cc75b348.tar.xz puppet-bbba9f9f52b71c0402a297b3d738aee0cc75b348.zip |
Avoid trying to set uid/gid on windows
-rw-r--r-- | lib/puppet/util/suidmanager.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb index 6f09005e2..f8dbca79e 100644 --- a/lib/puppet/util/suidmanager.rb +++ b/lib/puppet/util/suidmanager.rb @@ -50,7 +50,8 @@ module Puppet::Util::SUIDManager # Runs block setting uid and gid if provided then restoring original ids def asuser(new_uid=nil, new_gid=nil) - return yield unless root? + return yield if Puppet.features.win32? or !root? + # We set both because some programs like to drop privs, i.e. bash. old_uid, old_gid = self.uid, self.gid old_euid, old_egid = self.euid, self.egid |