puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/lib/puppet/util/profiler.rb

@@ -6,27 +6,34 @@ require 'benchmark'
 module Puppet::Util::Profiler
   require 'puppet/util/profiler/wall_clock'
   require 'puppet/util/profiler/object_counts'
-  require 'puppet/util/profiler/none'
+  require 'puppet/util/profiler/around_profiler'
 
-  NONE = Puppet::Util::Profiler::None.new
+  @profiler = Puppet::Util::Profiler::AroundProfiler.new
 
   # Reset the profiling system to the original state
   #
   # @api private
   def self.clear
-    @profiler = nil
+    @profiler.clear
   end
 
-  # @return This thread's configured profiler
+  # Retrieve the current list of profilers
+  #
   # @api private
   def self.current
-    @profiler || NONE
+    @profiler.current
   end
 
   # @param profiler [#profile] A profiler for the current thread
   # @api private
-  def self.current=(profiler)
-    @profiler = profiler
+  def self.add_profiler(profiler)
+    @profiler.add_profiler(profiler)
+  end
+
+  # @param profiler [#profile] A profiler to remove from the current thread
+  # @api private
+  def self.remove_profiler(profiler)
+    @profiler.remove_profiler(profiler)
   end
 
   # Profile a block of code and log the time it took to execute.
@@ -37,9 +44,10 @@ module Puppet::Util::Profiler
   # in the profiled hierachy.
   #
   # @param message [String] A description of the profiled event
+  # @param metric_id [Array] A list of strings making up the ID of a metric to profile
   # @param block [Block] The segment of code to profile
   # @api public
-  def self.profile(message, &block)
-    current.profile(message, &block)
+  def self.profile(message, metric_id = nil, &block)
+    @profiler.profile(message, metric_id, &block)
   end
 end

data/lib/puppet/util/profiler/aggregate.rb

@@ -0,0 +1,85 @@
+require 'puppet/util/profiler'
+require 'puppet/util/profiler/wall_clock'
+
+class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
+  def initialize(logger, identifier)
+    super(logger, identifier)
+    @metrics_hash = Metric.new
+  end
+
+  def shutdown()
+    super
+    @logger.call("AGGREGATE PROFILING RESULTS:")
+    @logger.call("----------------------------")
+    print_metrics(@metrics_hash, "")
+    @logger.call("----------------------------")
+  end
+
+  def do_start(description, metric_id)
+    super(description, metric_id)
+  end
+
+  def do_finish(context, description, metric_id)
+    result = super(context, description, metric_id)
+    update_metric(@metrics_hash, metric_id, result[:time])
+    result
+  end
+
+  def update_metric(metrics_hash, metric_id, time)
+    first, *rest = *metric_id
+    if first
+      m = metrics_hash[first]
+      m.increment
+      m.add_time(time)
+      if rest.count > 0
+        update_metric(m, rest, time)
+      end
+    end
+  end
+
+  def values
+    @metrics_hash
+  end
+
+  def print_metrics(metrics_hash, prefix)
+    metrics_hash.sort_by {|k,v| v.time }.reverse.each do |k,v|
+      @logger.call("#{prefix}#{k}: #{v.time} ms (#{v.count} calls)")
+      print_metrics(metrics_hash[k], "#{prefix}#{k} -> ")
+    end
+  end
+
+  class Metric < Hash
+    def initialize
+      super
+      @count = 0
+      @time = 0
+    end
+    attr_reader :count, :time
+
+    def [](key)
+      if !has_key?(key)
+        self[key] = Metric.new
+      end
+      super(key)
+    end
+
+    def increment
+      @count += 1
+    end
+
+    def add_time(time)
+      @time += time
+    end
+  end
+
+  class Timer
+    def initialize
+      @start = Time.now
+    end
+
+    def stop
+      Time.now - @start
+    end
+  end
+end
+

data/lib/puppet/util/profiler/around_profiler.rb

@@ -0,0 +1,67 @@
+# A Profiler that can be used to wrap around blocks of code. It is configured
+# with other profilers and controls them to start before the block is executed
+# and finish after the block is executed.
+#
+# @api private
+class Puppet::Util::Profiler::AroundProfiler
+
+  def initialize
+    @profilers = []
+  end
+
+  # Reset the profiling system to the original state
+  #
+  # @api private
+  def clear
+    @profilers = []
+  end
+
+  # Retrieve the current list of profilers
+  #
+  # @api private
+  def current
+    @profilers
+  end
+
+  # @param profiler [#profile] A profiler for the current thread
+  # @api private
+  def add_profiler(profiler)
+    @profilers << profiler
+    profiler
+  end
+
+  # @param profiler [#profile] A profiler to remove from the current thread
+  # @api private
+  def remove_profiler(profiler)
+    @profilers.delete(profiler)
+  end
+
+  # Profile a block of code and log the time it took to execute.
+  #
+  # This outputs logs entries to the Puppet masters logging destination
+  # providing the time it took, a message describing the profiled code
+  # and a leaf location marking where the profile method was called
+  # in the profiled hierachy.
+  #
+  # @param message [String] A description of the profiled event
+  # @param metric_id [Array] A list of strings making up the ID of a metric to profile
+  # @param block [Block] The segment of code to profile
+  # @api private
+  def profile(message, metric_id = nil)
+    retval = nil
+    contexts = {}
+    @profilers.each do |profiler|
+      contexts[profiler] = profiler.start(message, metric_id)
+    end
+
+    begin
+      retval = yield
+    ensure
+      @profilers.each do |profiler|
+        profiler.finish(contexts[profiler], message, metric_id)
+      end
+    end
+
+    retval
+  end
+end

data/lib/puppet/util/profiler/logging.rb

@@ -5,19 +5,20 @@ class Puppet::Util::Profiler::Logging
     @sequence = Sequence.new
   end
 
-  def profile(description, &block)
-    retval = nil
+  def start(description, metric_id)
     @sequence.next
     @sequence.down
-    context = start
-    begin
-      retval = yield
-    ensure
-      profile_explanation = finish(context)
-      @sequence.up
-      @logger.call("PROFILE [#{@identifier}] #{@sequence} #{description}: #{profile_explanation}")
-    end
-    retval
+    do_start(description, metric_id)
+  end
+
+  def finish(context, description, metric_id)
+    profile_explanation = do_finish(context, description, metric_id)[:msg]
+    @sequence.up
+    @logger.call("PROFILE [#{@identifier}] #{@sequence} #{description}: #{profile_explanation}")
+  end
+
+  def shutdown()
+    # nothing to do
   end
 
   class Sequence

data/lib/puppet/util/profiler/wall_clock.rb

@@ -6,13 +6,13 @@ require 'puppet/util/profiler/logging'
 #
 # @api private
 class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
-  def start
+  def do_start(description, metric_id)
     Timer.new
   end
 
-  def finish(context)
-    context.stop
-    "took #{context} seconds"
+  def do_finish(context, description, metric_id)
+    {:time => context.stop,
+     :msg => "took #{context} seconds"}
   end
 
   class Timer
@@ -23,11 +23,12 @@ class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
     end
 
     def stop
-      @finish = Time.now
+      @time = Time.now - @start
+      @time
     end
 
     def to_s
-      format(FOUR_DECIMAL_DIGITS, @finish - @start)
+      format(FOUR_DECIMAL_DIGITS, @time)
     end
   end
 end

data/lib/puppet/util/rdoc.rb

@@ -37,6 +37,13 @@ module Puppet::Util::RDoc
       options << "--force-update"
     end
     options += [ "--charset", charset] if charset
+    # Rdoc root default is Dir.pwd, but the win32-dir gem monkey patchs Dir.pwd
+    # replacing Ruby's normal / with \.  When RDoc generates relative paths it
+    # uses relative_path_from that will generate errors when the slashes don't
+    # properly match.  This is a workaround for that issue.
+    if Puppet.features.microsoft_windows? && RDoc::VERSION !~ /^[0-3]\./
+      options += [ "--root", Dir.pwd.gsub(/\\/, '/')]
+    end
     options += files
 
     # launch the documentation process
@@ -47,7 +54,7 @@ module Puppet::Util::RDoc
   def manifestdoc(files)
     Puppet[:ignoreimport] = true
     files.select { |f| FileTest.file?(f) }.each do |f|
-      parser = Puppet::Parser::Parser.new(Puppet.lookup(:environments).get(Puppet[:environment]))
+      parser = Puppet::Parser::Parser.new(Puppet.lookup(:current_environment))
       parser.file = f
       ast = parser.parse
       output(f, ast)

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -24,7 +24,7 @@ module RDoc::PuppetParserCore
 
   # main entry point
   def scan
-    environment = Puppet.lookup(:environments).get(Puppet[:environment])
+    environment = Puppet.lookup(:current_environment)
     known_resource_types = environment.known_resource_types
     unless known_resource_types.watching_file?(@input_file_name)
       Puppet.info "rdoc: scanning #{@input_file_name}"

data/lib/puppet/util/suidmanager.rb

@@ -18,14 +18,7 @@ module Puppet::Util::SUIDManager
 
   def osx_maj_ver
     return @osx_maj_ver unless @osx_maj_ver.nil?
-    # 'kernel' is available without explicitly loading all facts
-    if Facter.value('kernel') != 'Darwin'
-      @osx_maj_ver = false
-      return @osx_maj_ver
-    end
-    # But 'macosx_productversion_major' requires it.
-    Facter.loadfacts
-    @osx_maj_ver = Facter.value('macosx_productversion_major')
+    @osx_maj_ver = Facter.value('macosx_productversion_major') || false
   end
   module_function :osx_maj_ver
 

data/lib/puppet/util/windows.rb

@@ -1,17 +1,28 @@
 module Puppet::Util::Windows
+  module ADSI
+    class User; end
+    class UserProfile; end
+    class Group; end
+  end
+  module Registry
+  end
+
   if Puppet::Util::Platform.windows?
     # these reference platform specific gems
+    require 'puppet/util/windows/api_types'
+    require 'puppet/util/windows/string'
     require 'puppet/util/windows/error'
+    require 'puppet/util/windows/com'
     require 'puppet/util/windows/sid'
+    require 'puppet/util/windows/file'
     require 'puppet/util/windows/security'
     require 'puppet/util/windows/user'
     require 'puppet/util/windows/process'
-    require 'puppet/util/windows/string'
-    require 'puppet/util/windows/file'
     require 'puppet/util/windows/root_certs'
     require 'puppet/util/windows/access_control_entry'
     require 'puppet/util/windows/access_control_list'
     require 'puppet/util/windows/security_descriptor'
+    require 'puppet/util/windows/adsi'
+    require 'puppet/util/windows/registry'
   end
-  require 'puppet/util/windows/registry'
 end

data/lib/puppet/util/windows/access_control_list.rb

@@ -68,9 +68,9 @@ class Puppet::Util::Windows::AccessControlList
           # granted or denied the old_sid. We mask off all
           # flags except those affecting inheritance of the
           # ACE we're creating.
-          inherit_mask = Windows::Security::CONTAINER_INHERIT_ACE |
-            Windows::Security::OBJECT_INHERIT_ACE |
-            Windows::Security::INHERIT_ONLY_ACE
+          inherit_mask = Puppet::Util::Windows::AccessControlEntry::CONTAINER_INHERIT_ACE |
+            Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE |
+            Puppet::Util::Windows::AccessControlEntry::INHERIT_ONLY_ACE
           explicit_ace = Puppet::Util::Windows::AccessControlEntry.new(new_sid, ace.mask, ace.flags & inherit_mask, ace.type)
           aces_to_prepend << explicit_ace
         else
@@ -85,7 +85,7 @@ class Puppet::Util::Windows::AccessControlList
     @aces = []
 
     if prepend_needed
-      mask = Windows::Security::STANDARD_RIGHTS_ALL | Windows::Security::SPECIFIC_RIGHTS_ALL
+      mask = Puppet::Util::Windows::File::STANDARD_RIGHTS_ALL | Puppet::Util::Windows::File::SPECIFIC_RIGHTS_ALL
       ace = Puppet::Util::Windows::AccessControlEntry.new(
               Win32::Security::SID::LocalSystem,
               mask)

data/lib/puppet/util/{adsi.rb → windows/adsi.rb}

@@ -1,5 +1,9 @@
-module Puppet::Util::ADSI
+module Puppet::Util::Windows::ADSI
+  require 'ffi'
+
   class << self
+    extend FFI::Library
+
     def connectable?(uri)
       begin
         !! connect(uri)
@@ -17,18 +21,29 @@ module Puppet::Util::ADSI
     end
 
     def create(name, resource_type)
-      Puppet::Util::ADSI.connect(computer_uri).Create(resource_type, name)
+      Puppet::Util::Windows::ADSI.connect(computer_uri).Create(resource_type, name)
     end
 
     def delete(name, resource_type)
-      Puppet::Util::ADSI.connect(computer_uri).Delete(resource_type, name)
+      Puppet::Util::Windows::ADSI.connect(computer_uri).Delete(resource_type, name)
     end
 
+    # taken from winbase.h
+    MAX_COMPUTERNAME_LENGTH = 31
+
     def computer_name
       unless @computer_name
-        buf = " " * 128
-        Win32API.new('kernel32', 'GetComputerName', ['P','P'], 'I').call(buf, buf.length.to_s)
-        @computer_name = buf.unpack("A*")[0]
+        max_length = MAX_COMPUTERNAME_LENGTH + 1 # NULL terminated
+        FFI::MemoryPointer.new(max_length * 2) do |buffer| # wide string
+          FFI::MemoryPointer.new(:dword, 1) do |buffer_size|
+            buffer_size.write_dword(max_length) # length in TCHARs
+
+            if GetComputerNameW(buffer, buffer_size) == FFI::WIN32_FALSE
+              raise Puppet::Util::Windows::Error.new("Failed to get computer name")
+            end
+            @computer_name = buffer.read_wide_string(buffer_size.read_dword)
+          end
+        end
       end
       @computer_name
     end
@@ -48,8 +63,8 @@ module Puppet::Util::ADSI
       begin
         sid = Win32::Security::SID.new(Win32::Security::SID.string_to_sid(sid))
         sid_uri(sid)
-      rescue Win32::Security::SID::Error
-        return nil
+      rescue SystemCallError
+        nil
       end
     end
 
@@ -71,14 +86,26 @@ module Puppet::Util::ADSI
     end
 
     def sid_for_account(name)
-      Puppet.deprecation_warning "Puppet::Util::ADSI.sid_for_account is deprecated and will be removed in 3.0, use Puppet::Util::Windows::SID.name_to_sid instead."
+      Puppet.deprecation_warning "Puppet::Util::Windows::ADSI.sid_for_account is deprecated and will be removed in 3.0, use Puppet::Util::Windows::SID.name_to_sid instead."
 
-      Puppet::Util::Windows::Security.name_to_sid(name)
+      Puppet::Util::Windows::SID.name_to_sid(name)
     end
+
+    ffi_convention :stdcall
+
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724295(v=vs.85).aspx
+    # BOOL WINAPI GetComputerName(
+    #   _Out_    LPTSTR lpBuffer,
+    #   _Inout_  LPDWORD lpnSize
+    # );
+    ffi_lib :kernel32
+    attach_function_private :GetComputerNameW,
+      [:lpwstr, :lpdword], :win32_bool
   end
 
   class User
     extend Enumerable
+    extend FFI::Library
 
     attr_accessor :native_user
     attr_reader :name, :sid
@@ -100,19 +127,19 @@ module Puppet::Util::ADSI
     end
 
     def native_user
-      @native_user ||= Puppet::Util::ADSI.connect(self.class.uri(*self.class.parse_name(@name)))
+      @native_user ||= Puppet::Util::Windows::ADSI.connect(self.class.uri(*self.class.parse_name(@name)))
     end
 
     def sid
-      @sid ||= Puppet::Util::Windows::Security.octet_string_to_sid_object(native_user.objectSID)
+      @sid ||= Puppet::Util::Windows::SID.octet_string_to_sid_object(native_user.objectSID)
     end
 
     def self.uri(name, host = '.')
-      if sid_uri = Puppet::Util::ADSI.sid_uri_safe(name) then return sid_uri end
+      if sid_uri = Puppet::Util::Windows::ADSI.sid_uri_safe(name) then return sid_uri end
 
       host = '.' if ['NT AUTHORITY', 'BUILTIN', Socket.gethostname].include?(host)
 
-      Puppet::Util::ADSI.uri(name, 'user', host)
+      Puppet::Util::Windows::ADSI.uri(name, 'user', host)
     end
 
     def uri
@@ -168,14 +195,14 @@ module Puppet::Util::ADSI
 
     def add_to_groups(*group_names)
       group_names.each do |group_name|
-        Puppet::Util::ADSI::Group.new(group_name).add_member_sids(sid)
+        Puppet::Util::Windows::ADSI::Group.new(group_name).add_member_sids(sid)
       end
     end
     alias add_to_group add_to_groups
 
     def remove_from_groups(*group_names)
       group_names.each do |group_name|
-        Puppet::Util::ADSI::Group.new(group_name).remove_member_sids(sid)
+        Puppet::Util::Windows::ADSI::Group.new(group_name).remove_member_sids(sid)
       end
     end
     alias remove_from_group remove_from_groups
@@ -199,20 +226,40 @@ module Puppet::Util::ADSI
 
     def self.create(name)
       # Windows error 1379: The specified local group already exists.
-      raise Puppet::Error.new( "Cannot create user if group '#{name}' exists." ) if Puppet::Util::ADSI::Group.exists? name
-      new(name, Puppet::Util::ADSI.create(name, 'user'))
+      raise Puppet::Error.new( "Cannot create user if group '#{name}' exists." ) if Puppet::Util::Windows::ADSI::Group.exists? name
+      new(name, Puppet::Util::Windows::ADSI.create(name, 'user'))
+    end
+
+    # UNLEN from lmcons.h - http://stackoverflow.com/a/2155176
+    MAX_USERNAME_LENGTH = 256
+    def self.current_user_name
+      user_name = ''
+      max_length = MAX_USERNAME_LENGTH + 1 # NULL terminated
+      FFI::MemoryPointer.new(max_length * 2) do |buffer| # wide string
+        FFI::MemoryPointer.new(:dword, 1) do |buffer_size|
+          buffer_size.write_dword(max_length) # length in TCHARs
+
+          if GetUserNameW(buffer, buffer_size) == FFI::WIN32_FALSE
+            raise Puppet::Util::Windows::Error.new("Failed to get user name")
+          end
+          # buffer_size includes trailing NULL
+          user_name = buffer.read_wide_string(buffer_size.read_dword - 1)
+        end
+      end
+
+      user_name
     end
 
     def self.exists?(name)
-      Puppet::Util::ADSI::connectable?(User.uri(*User.parse_name(name)))
+      Puppet::Util::Windows::ADSI::connectable?(User.uri(*User.parse_name(name)))
     end
 
     def self.delete(name)
-      Puppet::Util::ADSI.delete(name, 'user')
+      Puppet::Util::Windows::ADSI.delete(name, 'user')
     end
 
     def self.each(&block)
-      wql = Puppet::Util::ADSI.execquery('select name from win32_useraccount where localaccount = "TRUE"')
+      wql = Puppet::Util::Windows::ADSI.execquery('select name from win32_useraccount where localaccount = "TRUE"')
 
       users = []
       wql.each do |u|
@@ -221,12 +268,23 @@ module Puppet::Util::ADSI
 
       users.each(&block)
     end
+
+    ffi_convention :stdcall
+
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724432(v=vs.85).aspx
+    # BOOL WINAPI GetUserName(
+    #   _Out_    LPTSTR lpBuffer,
+    #   _Inout_  LPDWORD lpnSize
+    # );
+    ffi_lib :advapi32
+    attach_function_private :GetUserNameW,
+      [:lpwstr, :lpdword], :win32_bool
   end
 
   class UserProfile
     def self.delete(sid)
       begin
-        Puppet::Util::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
+        Puppet::Util::Windows::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
       rescue => e
         # http://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
         # Prior to Vista SP1, there's no builtin way to programmatically
@@ -243,7 +301,7 @@ module Puppet::Util::ADSI
     extend Enumerable
 
     attr_accessor :native_group
-    attr_reader :name
+    attr_reader :name, :sid
     def initialize(name, native_group = nil)
       @name = name
       @native_group = native_group
@@ -254,13 +312,17 @@ module Puppet::Util::ADSI
     end
 
     def self.uri(name, host = '.')
-      if sid_uri = Puppet::Util::ADSI.sid_uri_safe(name) then return sid_uri end
+      if sid_uri = Puppet::Util::Windows::ADSI.sid_uri_safe(name) then return sid_uri end
 
-      Puppet::Util::ADSI.uri(name, 'group', host)
+      Puppet::Util::Windows::ADSI.uri(name, 'group', host)
     end
 
     def native_group
-      @native_group ||= Puppet::Util::ADSI.connect(uri)
+      @native_group ||= Puppet::Util::Windows::ADSI.connect(uri)
+    end
+
+    def sid
+      @sid ||= Puppet::Util::Windows::SID.octet_string_to_sid_object(native_group.objectSID)
     end
 
     def commit
@@ -276,7 +338,7 @@ module Puppet::Util::ADSI
       return [] if names.nil? or names.empty?
 
       sids = names.map do |name|
-        sid = Puppet::Util::Windows::Security.name_to_sid_object(name)
+        sid = Puppet::Util::Windows::SID.name_to_sid_object(name)
         raise Puppet::Error.new( "Could not resolve username: #{name}" ) if !sid
         [sid.to_s, sid]
       end
@@ -285,14 +347,14 @@ module Puppet::Util::ADSI
     end
 
     def add_members(*names)
-      Puppet.deprecation_warning('Puppet::Util::ADSI::Group#add_members is deprecated; please use Puppet::Util::ADSI::Group#add_member_sids')
+      Puppet.deprecation_warning('Puppet::Util::Windows::ADSI::Group#add_members is deprecated; please use Puppet::Util::Windows::ADSI::Group#add_member_sids')
       sids = self.class.name_sid_hash(names)
       add_member_sids(*sids.values)
     end
     alias add_member add_members
 
     def remove_members(*names)
-      Puppet.deprecation_warning('Puppet::Util::ADSI::Group#remove_members is deprecated; please use Puppet::Util::ADSI::Group#remove_member_sids')
+      Puppet.deprecation_warning('Puppet::Util::Windows::ADSI::Group#remove_members is deprecated; please use Puppet::Util::Windows::ADSI::Group#remove_member_sids')
       sids = self.class.name_sid_hash(names)
       remove_member_sids(*sids.values)
     end
@@ -300,13 +362,13 @@ module Puppet::Util::ADSI
 
     def add_member_sids(*sids)
       sids.each do |sid|
-        native_group.Add(Puppet::Util::ADSI.sid_uri(sid))
+        native_group.Add(Puppet::Util::Windows::ADSI.sid_uri(sid))
       end
     end
 
     def remove_member_sids(*sids)
       sids.each do |sid|
-        native_group.Remove(Puppet::Util::ADSI.sid_uri(sid))
+        native_group.Remove(Puppet::Util::Windows::ADSI.sid_uri(sid))
       end
     end
 
@@ -320,7 +382,7 @@ module Puppet::Util::ADSI
     def member_sids
       sids = []
       native_group.Members.each do |m|
-        sids << Puppet::Util::Windows::Security.octet_string_to_sid_object(m.objectSID)
+        sids << Puppet::Util::Windows::SID.octet_string_to_sid_object(m.objectSID)
       end
       sids
     end
@@ -342,20 +404,20 @@ module Puppet::Util::ADSI
 
     def self.create(name)
       # Windows error 2224: The account already exists.
-      raise Puppet::Error.new( "Cannot create group if user '#{name}' exists." ) if Puppet::Util::ADSI::User.exists? name
-      new(name, Puppet::Util::ADSI.create(name, 'group'))
+      raise Puppet::Error.new( "Cannot create group if user '#{name}' exists." ) if Puppet::Util::Windows::ADSI::User.exists? name
+      new(name, Puppet::Util::Windows::ADSI.create(name, 'group'))
     end
 
     def self.exists?(name)
-      Puppet::Util::ADSI.connectable?(Group.uri(name))
+      Puppet::Util::Windows::ADSI.connectable?(Group.uri(name))
     end
 
     def self.delete(name)
-      Puppet::Util::ADSI.delete(name, 'group')
+      Puppet::Util::Windows::ADSI.delete(name, 'group')
     end
 
     def self.each(&block)
-      wql = Puppet::Util::ADSI.execquery( 'select name from win32_group where localaccount = "TRUE"' )
+      wql = Puppet::Util::Windows::ADSI.execquery( 'select name from win32_group where localaccount = "TRUE"' )
 
       groups = []
       wql.each do |g|