[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

James Turnbull james at lovedthanlost.net
Fri Jan 23 14:21:47 UTC 2009


The following commit has been merged in the master branch:
commit 3a395095d7b913661484bc5caeeb90cb34cd5b3f
Author: Nigel Kersten <nigelk at google.com>
Date:   Wed Nov 26 13:59:55 2008 -0800

    make sure only types that have passwords search for the password

diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb
index 308f519..4e21d41 100644
--- a/lib/puppet/provider/nameservice/directoryservice.rb
+++ b/lib/puppet/provider/nameservice/directoryservice.rb
@@ -169,7 +169,9 @@ class DirectoryService < Puppet::Provider::NameService
         # stored in the user record. It is stored at a path that involves the
         # UUID of the user record for non-Mobile local acccounts.    
         # Mobile Accounts are out of scope for this provider for now
-        attribute_hash[:password] = self.get_password(attribute_hash[:guid])
+        if @resource_type.validproperties.include?(:password)
+            attribute_hash[:password] = self.get_password(attribute_hash[:guid])
+        end
         return attribute_hash    
     end
     

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list