Merge remote-tracking branch 'barn/tickets/2.6.x/6857-password-disclosure-when-changing-a-users-password' into 2.6.x

* barn/tickets/2.6.x/6857-password-disclosure-when-changing-a-users-password:
  (#6857) Password disclosure when changing a user's password

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
index f74e4266f..8d04fdc30 100755
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@ -165,6 +165,14 @@ module Puppet
           return "changed password"
         end
       end
+
+      def is_to_s( currentvalue )
+        return '[old password hash redacted]'
+      end
+      def should_to_s( newvalue )
+        return '[new password hash redacted]'
+      end
+
     end
 
     newproperty(:password_min_age, :required_features => :manages_password_age) do