diff --git a/lib/puppet/suidmanager.rb b/lib/puppet/suidmanager.rb
index d6bbc90f1..4f94ddde2 100644
--- a/lib/puppet/suidmanager.rb
+++ b/lib/puppet/suidmanager.rb
@@ -1,97 +1,97 @@
 require 'facter'
 require 'puppet/util/warnings'
 
 module Puppet
     module SUIDManager
         include Puppet::Util::Warnings
 
         platform = Facter["kernel"].value
         [:uid=, :gid=, :uid, :gid].each do |method|
             define_method(method) do |*args|
                 # NOTE: 'method' is closed here.
                 newmethod = method
 
                 if platform == "Darwin"
-                    warnonce "Cannot change real UID on Darwin"
+                    Puppet::Util::Warnings.warnonce "Cannot change real UID on Darwin"
                     newmethod = ("e" + method.to_s).intern
                 end
 
                 return Process.send(newmethod, *args)
             end
             module_function method
         end
 
         [:euid=, :euid, :egid=, :egid].each do |method|
             define_method(method) do |*args|
                 Process.send(method, *args)
             end
             module_function method
         end
 
         def run_and_capture(command, new_uid=self.euid, new_gid=self.egid)
             output = nil
 
             asuser(new_uid, new_gid) do
                 # capture both stdout and stderr unless we are on ruby < 1.8.4
                 # NOTE: this would be much better facilitated with a specialized popen()
                 #       (see the test suite for more details.)
                 if (Facter['rubyversion'].value <=> "1.8.4") < 0
-                    warnonce "Cannot capture STDERR when running as another user on Ruby < 1.8.4"
+                    Puppet::Util::Warnings.warnonce "Cannot capture STDERR when running as another user on Ruby < 1.8.4"
                     output = %x{#{command}}
                 else
                     output = %x{#{command} 2>&1}
                 end
             end
 
             [output, $?.dup]
         end
 
         module_function :run_and_capture
 
         def system(command, new_uid=self.euid, new_gid=self.egid)
             status = nil
             asuser(new_uid, new_gid) do
                 Kernel.system(command)
                 status = $?.dup
             end
             status
         end
         
         module_function :system
 
         def asuser(new_euid=nil, new_egid=nil)
             # Unless we're root, don't do a damn thing.
             unless Process.uid == 0
                 return yield
             end
             old_egid = old_euid = nil
             if new_egid
                 saved_state_egid = new_egid
                 new_egid = Puppet::Util.gid(new_egid)
                 if new_egid == nil
                   raise Puppet::Error, "Invalid group: %s" % saved_state_egid
                 end
                 old_egid = self.egid
                 self.egid = new_egid
             end
             if new_euid
                 saved_state_euid = new_euid
                 new_euid = Puppet::Util.uid(new_euid)
                 if new_euid == nil
                   raise Puppet::Error, "Invalid user: %s" % saved_state_euid
                 end
                 old_euid = self.euid
                 self.euid = new_euid
             end
 
             return yield
         ensure
             self.egid = old_egid if old_egid
             self.euid = old_euid if old_euid
         end
 
         module_function :asuser
     end
 end
 
 # $Id$