components/ruby/puppet/patches/puppet-09-role-shell.patch
changeset 5860 afd31ba91ee9
parent 5728 19424f2daf9f
equal deleted inserted replaced
5859:98bc99958997 5860:afd31ba91ee9
     1 --- puppet-3.8.3/lib/puppet/provider/user/user_role_add.rb.orig	2015-09-21 14:46:28.000000000 -0700
     1 --- puppet-3.8.6/lib/puppet/provider/user/user_role_add.rb.orig	2016-04-19 14:32:54.606087591 -0700
     2 +++ puppet-3.8.3/lib/puppet/provider/user/user_role_add.rb	2015-12-03 09:41:52.593175175 -0800
     2 +++ puppet-3.8.6/lib/puppet/provider/user/user_role_add.rb	2016-04-19 14:34:04.451831050 -0700
     3 @@ -12,6 +12,7 @@
     3 @@ -1,3 +1,7 @@
       
     4 +#######################################################################
       
     5 +# Oracle has modified the originally distributed contents of this file.
       
     6 +#######################################################################
       
     7 +
       
     8  require 'puppet/util'
       
     9  require 'puppet/util/user_attr'
       
    10  require 'date'
       
    11 @@ -12,6 +16,7 @@
     4    options :home, :flag => "-d", :method => :dir
    12    options :home, :flag => "-d", :method => :dir
     5    options :comment, :method => :gecos
    13    options :comment, :method => :gecos
     6    options :groups, :flag => "-G"
    14    options :groups, :flag => "-G"
     7 +  options :shell, :flag => "-s"
    15 +  options :shell, :flag => "-s"
     8    options :roles, :flag => "-R"
    16    options :roles, :flag => "-R"
     9    options :auths, :flag => "-A"
    17    options :auths, :flag => "-A"
    10    options :profiles, :flag => "-P"
    18    options :profiles, :flag => "-P"
    11 @@ -26,7 +27,22 @@
    19 @@ -26,7 +31,22 @@
    12      value !~ /\s/
    20      value !~ /\s/
    13    end
    21    end
    14  
    22  
    15 +  def shell=(value)
    23 +  def shell=(value)
    16 +    check_valid_shell
    24 +    check_valid_shell