4 files changed, 21 insertions, 2 deletions
diff --git a/lib/puppet/base64.rb b/lib/puppet/base64.rb
new file mode 100755
index 000000000..4030ad358
--- /dev/null
+++ b/lib/puppet/base64.rb
@@ -0,0 +1,19 @@
+# a stupid hack class to get rid of all of the warnings but
+# still make the encode/decode methods available
+
+# 1.8.2 has a Base64 class, but 1.8.1 just imports the methods directly
+# into Object
+
+require 'base64'
+
+unless defined? Base64
+    class Base64
+        def Base64.encode64(*args)
+            Object.method(:encode64).call(*args)
+        end
+
+        def Base64.decode64(*args)
+            Object.method(:decode64).call(*args)
+        end
+    end
+end
diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb
index acfa23af4..38b9fa7fa 100644
--- a/lib/puppet/client.rb
+++ b/lib/puppet/client.rb
@@ -12,6 +12,7 @@ require 'puppet/transportable'
 require 'puppet/metric'
 require 'puppet/daemon'
 require 'puppet/server'
+require 'puppet/base64'
 
 $noclientnetworking = false
 begin
diff --git a/lib/puppet/server.rb b/lib/puppet/server.rb
index d3259e60d..6c9dbf37b 100644
--- a/lib/puppet/server.rb
+++ b/lib/puppet/server.rb
@@ -142,7 +142,6 @@ module Puppet
             @name = :Status
 
             def status(status = nil, client = nil, clientip = nil)
-                Puppet.warning "Returning status"
                 return 1
             end
         end
diff --git a/lib/puppet/server/filebucket.rb b/lib/puppet/server/filebucket.rb
index 4fbf78021..38993362e 100755
--- a/lib/puppet/server/filebucket.rb
+++ b/lib/puppet/server/filebucket.rb
@@ -13,7 +13,7 @@ require 'xmlrpc/client'
 #require 'webrick/httpstatus'
 require 'facter'
 require 'digest/md5'
-require 'base64'
+require 'puppet/base64'
 
 module Puppet
 class Server