From 9bae8356fded9d1c7aaea96cba246709bfe1a516 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 22 Apr 2015 16:04:00 -0700
Subject: pw_hash: avoid ruby magic when running on java

---
 lib/puppet/parser/functions/pw_hash.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'lib/puppet')

diff --git a/lib/puppet/parser/functions/pw_hash.rb b/lib/puppet/parser/functions/pw_hash.rb
index ad3e393..4682a63 100644
--- a/lib/puppet/parser/functions/pw_hash.rb
+++ b/lib/puppet/parser/functions/pw_hash.rb
@@ -42,15 +42,13 @@ Puppet::Parser::Functions::newfunction(
     if 'test'.crypt('$1$1') != '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
       # JRuby < 1.7.17
       if RUBY_PLATFORM == 'java'
-        # override String#crypt for password variable
-        def password.crypt(salt)
-          # puppetserver bundles Apache Commons Codec
-          org.apache.commons.codec.digest.Crypt.crypt(self.to_java_bytes, salt)
-        end
+        # puppetserver bundles Apache Commons Codec
+        org.apache.commons.codec.digest.Crypt.crypt(password.to_java_bytes, salt)
       else
         # MS Windows and other systems that don't support enhanced salts
         raise Puppet::ParseError, 'system does not support enhanced salts'
       end
+    else
+      password.crypt("$#{hash_type}$#{args[2]}")
     end
-    password.crypt("$#{hash_type}$#{args[2]}")
 end
-- 
cgit v1.2.3


From 063c58a992c1b5441b7e7b2a2e4886531035bb25 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 22 Apr 2015 16:21:21 -0700
Subject: range: remove dead code

Since a ParseError is always thrown for zero arguments, the if and all
dependent code can be removed.
---
 lib/puppet/parser/functions/range.rb | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

(limited to 'lib/puppet')

diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 49fba21..16d189f 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -41,29 +41,9 @@ Will return: [0,2,4,6,8]
     raise(Puppet::ParseError, "range(): Wrong number of " +
       "arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
-    if arguments.size > 1
-      start = arguments[0]
-      stop  = arguments[1]
-      step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
-
-      type = '..' # We select simplest type for Range available in Ruby ...
-
-    elsif arguments.size > 0
-      value = arguments[0]
-
-      if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
-        start = m[1]
-        stop  = m[3]
-
-        type = m[2]
-
-      elsif value.match(/^.+$/)
-        raise(Puppet::ParseError, 'range(): Unable to compute range ' +
-          'from the value given')
-      else
-        raise(Puppet::ParseError, 'range(): Unknown format of range given')
-      end
-    end
+    start = arguments[0]
+    stop  = arguments[1]
+    step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
 
     # Check whether we have integer value if so then make it so ...
     if start.to_s.match(/^\d+$/)
@@ -74,14 +54,10 @@ Will return: [0,2,4,6,8]
       stop  = stop.to_s
     end
 
-    range = case type
-      when /^(\.\.|\-)$/ then (start .. stop)
-      when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
-    end
-
-    result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
+    # We select simplest type for Range available in Ruby ...
+    range = (start .. stop)
 
-    return result
+    range.step(step).collect { |i| i } # Get them all ... Pokemon ...
   end
 end
 
-- 
cgit v1.2.3


From d4f3d57f1678ae03a58a17181f863c44c248f09b Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 29 Apr 2015 12:13:08 +0100
Subject: validate_augeas: fix URL to docs

---
 lib/puppet/parser/functions/validate_augeas.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/puppet')

diff --git a/lib/puppet/parser/functions/validate_augeas.rb b/lib/puppet/parser/functions/validate_augeas.rb
index 4ea4fe0..2196c3e 100644
--- a/lib/puppet/parser/functions/validate_augeas.rb
+++ b/lib/puppet/parser/functions/validate_augeas.rb
@@ -31,7 +31,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
     unless Puppet.features.augeas?
-      raise Puppet::ParseError, ("validate_augeas(): this function requires the augeas feature. See http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Augeas#Pre-requisites for how to activate it.")
+      raise Puppet::ParseError, ("validate_augeas(): this function requires the augeas feature. See http://docs.puppetlabs.com/guides/augeas.html#pre-requisites for how to activate it.")
     end
 
     if (args.length < 2) or (args.length > 4) then
-- 
cgit v1.2.3