Merge branch 'master' of ssh://reductivelabs.com/opt/rl/git/puppet

3 files changed, 14 insertions, 0 deletions

diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
index d15c1f622..fae0587e1 100644
--- a/lib/puppet/parameter.rb
+++ b/lib/puppet/parameter.rb
@@ -1,6 +1,7 @@
 require 'puppet/util/methodhelper'
 require 'puppet/util/log_paths'
 require 'puppet/util/logging'
+require 'puppet/util/docs'
 
 class Puppet::Parameter
     include Puppet::Util
@@ -10,6 +11,7 @@ class Puppet::Parameter
     include Puppet::Util::MethodHelper
     class << self
         include Puppet::Util
+        include Puppet::Util::Docs
         attr_reader :validater, :munger, :name, :default, :required_features
         attr_accessor :metaparam
 
diff --git a/lib/puppet/util/docs.rb b/lib/puppet/util/docs.rb
index aabf58d89..01178e5f4 100644
--- a/lib/puppet/util/docs.rb
+++ b/lib/puppet/util/docs.rb
@@ -67,6 +67,11 @@ module Puppet::Util::Docs
         str + "\n"
     end
 
+    attr_reader :nodoc
+    def nodoc?
+        nodoc
+    end
+
     # Pad a field with spaces
     def pad(value, length)
         value.to_s + (" " * (length - value.to_s.length))
diff --git a/lib/puppet/util/posix.rb b/lib/puppet/util/posix.rb
index 84fb744a9..c518a8797 100755
--- a/lib/puppet/util/posix.rb
+++ b/lib/puppet/util/posix.rb
@@ -53,6 +53,13 @@ module Puppet::Util::POSIX
                 return object.send(field)
             end
         end
+
+        # Apparently the group/passwd methods need to get reset; if we skip
+        # this call, then new users aren't found.
+        case type
+        when :passwd: Etc.send(:endpwent)
+        when :group: Etc.send(:endgrent)
+        end
         return nil
     end