diff options
-rw-r--r-- | CHANGELOG | 2 | ||||
-rwxr-xr-x | bin/ralsh | 4 | ||||
-rw-r--r-- | lib/puppet/provider/nameservice/directoryservice.rb | 6 |
3 files changed, 9 insertions, 3 deletions
@@ -1,4 +1,6 @@ 0.24.8 + Fixed #2077 - ralsh user broken on OSX + Fixed #2000 - No default specified for checksum Fixed #2026 - Red Hat ignoring stop method @@ -88,6 +88,7 @@ require 'getoptlong' require 'puppet' +require 'facter' options = [ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ], @@ -99,6 +100,9 @@ options = [ [ "--help", "-h", GetoptLong::NO_ARGUMENT ] ] +# Load facts from Facter +Facter.loadfacts + # Add all of the config parameters as valid options. Puppet.settings.addargs(options) diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index 42c52f0a7..0e06bb089 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -118,7 +118,7 @@ class DirectoryService < Puppet::Provider::NameService begin product_version = Facter.value(:macosx_productversion) if product_version.nil? - raise Puppet::Error, "Could not determine OS X version: %s" % detail + raise Puppet::Error, "Could not determine OS X version" end product_version_major = product_version.scan(/(\d+)\.(\d+)./).join(".") if %w{10.0 10.1 10.2 10.3}.include?(product_version_major) @@ -320,14 +320,14 @@ class DirectoryService < Puppet::Provider::NameService def self.get_password(guid) password_hash = nil password_hash_file = "#{@@password_hash_dir}/#{guid}" - if File.exists?(password_hash_file) + if File.exists?(password_hash_file) and File.file?(password_hash_file) if not File.readable?(password_hash_file) raise Puppet::Error("Could not read password hash file at #{password_hash_file} for #{@resource[:name]}") end f = File.new(password_hash_file) password_hash = f.read f.close - end + end password_hash end |