From: Eli Young <elyscape@gmail.com>
Date: Tue, 5 May 2015 22:16:35 +0000 (-0700)
Subject: pw_hash: Fix functionality on JRuby < 1.7.17
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7d7e905b543448f5d37d13c9e1a03d1e0be307fe;p=puppet-stdlib.git

pw_hash: Fix functionality on JRuby < 1.7.17

The previous change to this function broke it on JRuby before 1.7.17 by
attempting to use a variable that wasn't defined (`salt`). To fix this,
define `salt` ahead of time and use that instead of building the salt
later.

cf. https://github.com/puppetlabs/puppetlabs-stdlib/pull/443#discussion_r29718588
---

diff --git a/lib/puppet/parser/functions/pw_hash.rb b/lib/puppet/parser/functions/pw_hash.rb
index 4682a63..41d4223 100644
--- a/lib/puppet/parser/functions/pw_hash.rb
+++ b/lib/puppet/parser/functions/pw_hash.rb
@@ -38,6 +38,8 @@ Puppet::Parser::Functions::newfunction(
     password = args[0]
     return nil if password.nil? or password.empty?
 
+    salt = "$#{hash_type}$#{args[2]}"
+
     # handle weak implementations of String#crypt
     if 'test'.crypt('$1$1') != '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
       # JRuby < 1.7.17
@@ -49,6 +51,6 @@ Puppet::Parser::Functions::newfunction(
         raise Puppet::ParseError, 'system does not support enhanced salts'
       end
     else
-      password.crypt("$#{hash_type}$#{args[2]}")
+      password.crypt(salt)
     end
 end