diff options
| author | Stig Sandbeck Mathisen <ssm@debian.org> | 2014-09-07 10:14:36 +0200 |
|---|---|---|
| committer | Stig Sandbeck Mathisen <ssm@debian.org> | 2014-09-07 10:14:36 +0200 |
| commit | d4b83be375ac1dead058e091191ee7c7b7c24c8a (patch) | |
| tree | dc825687392ae3068de5b764be60c53122d9e02a /lib/puppet/provider/file/windows.rb | |
| parent | 229cbb976fe0f70f5f30548b83517b415840f9bb (diff) | |
| parent | 1681684857c6e39d60d87b0b3520d8783977ceff (diff) | |
| download | puppet-upstream/3.7.0.tar.gz | |
Imported Upstream version 3.7.0upstream/3.7.0
Diffstat (limited to 'lib/puppet/provider/file/windows.rb')
| -rw-r--r-- | lib/puppet/provider/file/windows.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/puppet/provider/file/windows.rb b/lib/puppet/provider/file/windows.rb index 5c8038db1..c0ef68cd9 100644 --- a/lib/puppet/provider/file/windows.rb +++ b/lib/puppet/provider/file/windows.rb @@ -8,20 +8,19 @@ Puppet::Type.type(:file).provide :windows do if Puppet.features.microsoft_windows? require 'puppet/util/windows' - require 'puppet/util/adsi' include Puppet::Util::Windows::Security end # Determine if the account is valid, and if so, return the UID def name2id(value) - Puppet::Util::Windows::Security.name_to_sid(value) + Puppet::Util::Windows::SID.name_to_sid(value) end # If it's a valid SID, get the name. Otherwise, it's already a name, # so just return it. def id2name(id) - if Puppet::Util::Windows::Security.valid_sid?(id) - Puppet::Util::Windows::Security.sid_to_name(id) + if Puppet::Util::Windows::SID.valid_sid?(id) + Puppet::Util::Windows::SID.sid_to_name(id) else id end |