puppet 5.5.7-x86-mingw32 → 5.5.8-x86-mingw32

data/lib/puppet/provider/group/windows_adsi.rb

@@ -22,9 +22,10 @@ Puppet::Type.type(:group).provide :windows_adsi do
 
     # Cannot use munge of the group property to canonicalize @should
     # since the default array_matching comparison is not commutative
+
     # dupes automatically weeded out when hashes built
-    current_members = Puppet::Util::Windows::ADSI::User.name_sid_hash(current)
-    specified_members = Puppet::Util::Windows::ADSI::User.name_sid_hash(should)
+    current_members = Puppet::Util::Windows::ADSI::Group.name_sid_hash(current)
+    specified_members = Puppet::Util::Windows::ADSI::Group.name_sid_hash(should)
 
     current_sids = current_members.keys.to_a
     specified_sids = specified_members.keys.to_a
@@ -65,7 +66,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def members
-    @members ||= Puppet::Util::Windows::ADSI::User.name_sid_hash(group.members)
+    @members ||= Puppet::Util::Windows::ADSI::Group.name_sid_hash(group.members)
     @members.keys
   end
 

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -116,7 +116,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       ds_value = input_hash[key]
       case ds_to_ns_attribute_map[ds_attribute]
         when :members
-          ds_value = ds_value.join(',')
+          ds_value = ds_value # only members uses arrays so far
         when :gid, :uid
           # OS X stores objects like uid/gid as strings.
           # Try casting to an integer for these cases to be
@@ -344,10 +344,8 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
   def set(param, value)
     self.class.validate(param, value)
+    current_members = @property_value_cache_hash[:members]
     if param == :members
-      current_members = @property_value_cache_hash[:members].split(',')
-      value = value.split(',')
-
       # If we are meant to be authoritative for the group membership
       # then remove all existing members who haven't been specified
       # in the manifest.
@@ -411,7 +409,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       end
       if value != "" and not value.nil?
         if property == :members
-          add_members(nil, value.split(','))
+          add_members(nil, value)
         else
           exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name])
           exec_arg_vector << ns_to_ds_attribute_map[property.intern]

data/lib/puppet/provider/package/dnf.rb

@@ -29,6 +29,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
   end
 
   defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (22..30).to_a
+  defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["8"]
 
   def self.update_command
     # In DNF, update is deprecated for upgrade

data/lib/puppet/provider/user/useradd.rb

@@ -134,15 +134,6 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     cmd
   end
 
-  def check_manage_expiry
-    cmd = []
-    if @resource[:expiry] and not @resource.forcelocal?
-      cmd << "-e #{@resource[:expiry]}"
-    end
-
-    cmd
-  end
-
   def check_system_users
     if self.class.system_users? and resource.system?
       ["-r"]
@@ -188,7 +179,8 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
   def modifycmd(param, value)
     if @resource.forcelocal?
-      if param == :groups
+      case param
+      when :groups, :expiry
         cmd = [command(:modify)]
       else
         cmd = [command(property_manages_password_age?(param) ? :localpassword : :localmodify)]

data/lib/puppet/type/group.rb

@@ -1,7 +1,6 @@
 require 'etc'
 require 'facter'
 require 'puppet/property/keyvalue'
-require 'puppet/property/list'
 require 'puppet/parameter/boolean'
 
 module Puppet
@@ -82,84 +81,69 @@ module Puppet
       end
     end
 
-    newproperty(:members, :parent => Puppet::Property::List, :required_features => :manages_members) do
+    newproperty(:members, :array_matching => :all, :required_features => :manages_members) do
       desc "The members of the group. For platforms or directory services where group
         membership is stored in the group objects, not the users. This parameter's
         behavior can be configured with `auth_membership`."
 
-      validate do |value|
-        unless value.is_a?(String)
-          raise ArgumentError, _("The members property must be specified as either an array of strings, or as a single string consisting of a comma-separated list of members")
-        end
-
-        if value.is_a?(Integer) || value =~ /^\d+$/
-          raise ArgumentError, _("User names must be provided, not UID numbers.")
-        end
+      def change_to_s(currentvalue, newvalue)
+        newvalue = actual_should(currentvalue, newvalue)
 
-        if value.empty?
-          raise ArgumentError, _("User names must not be empty. If you want to specify \"no users\" pass an empty array")
-        end
+        currentvalue = currentvalue.join(",") if currentvalue != :absent
+        newvalue = newvalue.join(",")
+        super(currentvalue, newvalue)
+      end
 
-        if provider.respond_to?(:member_valid?)
-          return provider.member_valid?(value)
+      def insync?(current)
+        if provider.respond_to?(:members_insync?)
+          return provider.members_insync?(current, @should)
         end
-      end
 
-      def inclusive?
-        @resource[:auth_membership]
+        super(current)
       end
 
-      def change_to_s(currentvalue, newvalue)
-        newvalue = newvalue.split(",") if newvalue != :absent
-
+      def is_to_s(currentvalue)
         if provider.respond_to?(:members_to_s)
-          # for Windows ADSI
-          # de-dupe the "newvalue" when the sync event message is generated,
-          # due to final retrieve called after the resource has been modified
-          newvalue = provider.members_to_s(newvalue).split(',').uniq
+          currentvalue = '' if currentvalue.nil?
+          currentvalue = currentvalue.is_a?(Array) ? currentvalue : currentvalue.split(',')
+
+          return provider.members_to_s(currentvalue)
         end
 
-        super(currentvalue, newvalue)
+        super(currentvalue)
       end
 
-      # override Puppet::Property::List#retrieve
-      def retrieve
-        if provider.respond_to?(:members_to_s)
-          # Windows ADSI members returns SIDs, but retrieve needs names
-          # must return qualified names for SIDs for "is" value and puppet resource
-          return provider.members_to_s(provider.members).split(',')
-        end
-
-        super
+      def should_to_s(newvalue)
+        is_to_s(actual_should(retrieve, newvalue))
       end
 
-      # The members property should also accept a comma separated
-      # list of members (a String parameter) for backwards
-      # compatibility. Unfortunately, the List property would treat
-      # our comma separated list of members as a single-element Array.
-      # This override of should= ensures that a comma separated list of
-      # members is munged to an array of members, which is what we want.
-      # Note that we cannot use `munge` because that will pass in each
-      # array element instead of the entire array if the members property
-      # is specified as an array of members, which would cause each member
-      # to be munged into an array for that case. This is undesirable
-      # behavior.
-      def should=(values)
-        super(values)
-
-        if @should.length == 1 && @should.first.include?(delimiter)
-          @should = @should.first.split(delimiter)
+      # Calculates the actual should value given the current and
+      # new values. This is only used in should_to_s and change_to_s
+      # to fix the change notification issue reported in PUP-6542.
+      def actual_should(currentvalue, newvalue)
+        currentvalue = munge_members_value(currentvalue)
+        newvalue = munge_members_value(newvalue)
+
+        if @resource[:auth_membership]
+          newvalue.uniq.sort 
+        else
+          (currentvalue + newvalue).uniq.sort
         end
+      end
+
+      # Useful helper to handle the possible property value types that we can
+      # both pass-in and return. It munges the value into an array
+      def munge_members_value(value)
+        return [] if value == :absent
+        return value.split(',') if value.is_a?(String)
 
-        @should
+        value
       end
 
-      def insync?(current)
-        if provider.respond_to?(:members_insync?)
-          return provider.members_insync?(current, @should)
+      validate do |value|
+        if provider.respond_to?(:member_valid?)
+          return provider.member_valid?(value)
         end
-
-        super(current)
       end
     end
 

data/lib/puppet/util/filetype.rb

@@ -166,6 +166,12 @@ class Puppet::Util::FileType
   end
 
   # Handle Linux-style cron tabs.
+  #
+  # TODO: We can possibly eliminate the "-u <username>" option in cmdbase
+  # by just running crontab under <username>'s uid (like we do for suntab
+  # and aixtab). It may be worth investigating this alternative
+  # implementation in the future. This way, we can refactor all three of
+  # our cron file types into a common crontab file type.
   newfiletype(:crontab) do
     def initialize(user)
       self.path = user
@@ -185,16 +191,26 @@ class Puppet::Util::FileType
 
     # Read a specific @path's cron tab.
     def read
-      %x{#{cmdbase} -l 2>/dev/null}
+      Puppet::Util::Execution.execute("#{cmdbase} -l", failonfail: true, combine: true)
+    rescue => detail
+      case detail.to_s
+      when /no crontab for/
+        return ""
+      when /are not allowed to/
+        raise FileReadError, _("User %{path} not authorized to use cron") % { path: @path }, detail.backtrace
+      else
+        raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
+      end
     end
 
     # Remove a specific @path's cron tab.
     def remove
+      cmd = "#{cmdbase} -r"
       if %w{Darwin FreeBSD DragonFly}.include?(Facter.value("operatingsystem"))
-        %x{/bin/echo yes | #{cmdbase} -r 2>/dev/null}
-      else
-        %x{#{cmdbase} -r 2>/dev/null}
+        cmd = "/bin/echo yes | #{cmd}"
       end
+
+      Puppet::Util::Execution.execute(cmd, failonfail: true, combine: true)
     end
 
     # Overwrite a specific @path's cron tab; must be passed the @path name
@@ -270,7 +286,7 @@ class Puppet::Util::FileType
       Puppet::Util::Execution.execute(%w{crontab -l}, cronargs)
     rescue => detail
       case detail.to_s
-      when /Cannot open a file in the .* directory/
+      when /open.*in.*directory/
         return ""
       when /You are not authorized to use the cron command/
         raise FileReadError, _("User %{path} not authorized to use cron") % { path: @path }, detail.backtrace

data/lib/puppet/util/log/destinations.rb

@@ -77,9 +77,10 @@ Puppet::Util::Log.newdesttype :file do
 
     # create the log file, if it doesn't already exist
     need_array_start = false
+    file_exists = File.exists?(path)
     if @json == 1
       need_array_start = true
-      if File.exists?(path)
+      if file_exists
         sz = File.size(path)
         need_array_start = sz == 0
 
@@ -93,7 +94,7 @@ Puppet::Util::Log.newdesttype :file do
     file.puts('[') if need_array_start
 
     # Give ownership to the user and group puppet will run as
-    if Puppet.features.root? && !Puppet::Util::Platform.windows?
+    if Puppet.features.root? && !Puppet::Util::Platform.windows? && !file_exists
       begin
         FileUtils.chown(Puppet[:user], Puppet[:group], path)
       rescue ArgumentError, Errno::EPERM

data/lib/puppet/util/windows/adsi.rb

@@ -549,8 +549,6 @@ module Puppet::Util::Windows::ADSI
     def set_members(desired_members, inclusive = true)
       return if desired_members.nil?
 
-      desired_members = desired_members.split(',').map(&:strip)
-
       current_hash = Hash[ self.member_sids.map { |sid| [sid.sid, sid] } ]
       desired_hash = self.class.name_sid_hash(desired_members)
 

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '5.5.7'
+  PUPPETVERSION = '5.5.8'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.5.6-182-g088460f\n"
+"Project-Id-Version: Puppet automation framework 5.5.7-46-g0e9b9d7\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2018-10-10 17:59+0000\n"
-"PO-Revision-Date: 2018-10-10 17:59+0000\n"
+"POT-Creation-Date: 2018-10-29 22:32+0000\n"
+"PO-Revision-Date: 2018-10-29 22:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -164,7 +164,7 @@ msgstr ""
 msgid "No valid command or main"
 msgstr ""
 
-#: ../lib/puppet/application.rb:492
+#: ../lib/puppet/application.rb:497
 msgid "No help available for puppet %{app_name}"
 msgstr ""
 
@@ -221,11 +221,11 @@ msgstr ""
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:318 ../lib/puppet/application/script.rb:238
+#: ../lib/puppet/application/apply.rb:319 ../lib/puppet/application/script.rb:238
 msgid "Exiting"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:346
+#: ../lib/puppet/application/apply.rb:347
 msgid "Could not deserialize catalog from %{format}: %{detail}"
 msgstr ""
 
@@ -449,11 +449,11 @@ msgstr ""
 msgid "The WEBrick Puppet master server is deprecated and will be removed in a future release. Please use Puppet Server instead. See http://links.puppet.com/deprecate-rack-webrick-servers for more information."
 msgstr ""
 
-#: ../lib/puppet/application/master.rb:266
+#: ../lib/puppet/application/master.rb:268
 msgid "Puppet master is not supported on Microsoft Windows"
 msgstr ""
 
-#: ../lib/puppet/application/master.rb:315
+#: ../lib/puppet/application/master.rb:317
 msgid "Starting Puppet master version %{version}"
 msgstr ""
 
@@ -668,24 +668,32 @@ msgstr ""
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1034 ../lib/puppet/defaults.rb:1061
+#: ../lib/puppet/defaults.rb:1043
 msgid "The 'caprivatedir' setting is deprecated and will be removed in Puppet 6."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1531 ../lib/puppet/defaults.rb:1546
+#: ../lib/puppet/defaults.rb:1070
+msgid "The 'capass' setting is deprecated and will be removed in Puppet 6."
+msgstr ""
+
+#: ../lib/puppet/defaults.rb:1310
+msgid "The 'ca' setting is deprecated and will be removed in Puppet 6."
+msgstr ""
+
+#: ../lib/puppet/defaults.rb:1542 ../lib/puppet/defaults.rb:1557
 msgid "Attempted to set both server and server_list."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1532 ../lib/puppet/defaults.rb:1547
+#: ../lib/puppet/defaults.rb:1543 ../lib/puppet/defaults.rb:1558
 msgid "Server setting will not be used."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1817 ../lib/puppet/settings.rb:1167
+#: ../lib/puppet/defaults.rb:1828 ../lib/puppet/settings.rb:1167
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:1868
+#: ../lib/puppet/defaults.rb:1879
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
@@ -965,7 +973,7 @@ msgid "Delete a Puppet setting."
 msgstr ""
 
 #: ../lib/puppet/face/config.rb:213
-msgid "(<setting>"
+msgid "<setting>"
 msgstr ""
 
 #. TRANSLATORS 'main' is a specific section name and should not be translated
@@ -1809,7 +1817,7 @@ msgid "Diff is not supported on this platform"
 msgstr ""
 
 #: ../lib/puppet/file_bucket/dipper.rb:80
-msgid "Please provide a file or checksum do diff with"
+msgid "Please provide a file or checksum to diff with"
 msgstr ""
 
 #: ../lib/puppet/file_bucket/dipper.rb:96
@@ -2151,62 +2159,62 @@ msgstr ""
 msgid "No loader present. Call create_loaded_function(:myname, loader,...), instead of 'create_function' if running tests"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:414
+#: ../lib/puppet/functions.rb:413
 msgid "A required parameter cannot be added after an optional parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:463
+#: ../lib/puppet/functions.rb:462
 msgid "A required repeated parameter cannot be added after an optional parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:485
+#: ../lib/puppet/functions.rb:484
 msgid "block_param accepts max 2 arguments (type, name), got %{size}."
 msgstr ""
 
-#: ../lib/puppet/functions.rb:489
+#: ../lib/puppet/functions.rb:488
 msgid "Expected PCallableType or PVariantType thereof, got %{type_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:493
+#: ../lib/puppet/functions.rb:492
 msgid "Expected block_param name to be a Symbol, got %{name_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:500
+#: ../lib/puppet/functions.rb:499
 msgid "Attempt to redefine block"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:522
+#: ../lib/puppet/functions.rb:521
 msgid "Argument to 'return_type' must be a String reference to a Puppet Data Type. Got %{type_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:531
+#: ../lib/puppet/functions.rb:530
 msgid "Parameters cannot be added after a block parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:532
+#: ../lib/puppet/functions.rb:531
 msgid "Parameters cannot be added after a repeated parameter"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:535
+#: ../lib/puppet/functions.rb:534
 msgid "Parameter name argument must be a Symbol. Got %{name_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:548
+#: ../lib/puppet/functions.rb:547
 msgid "Parameter 'type' must be a String reference to a Puppet Data Type. Got %{type_class}"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:592
+#: ../lib/puppet/functions.rb:591
 msgid ""
 "Parsing of type string '\"%{type_string}\"' failed with message: <%{message}>.\n"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:635
+#: ../lib/puppet/functions.rb:634
 msgid ""
 "Parsing of 'type \"%{assignment_string}\"' failed with message: <%{message}>.\n"
 "Called from <%{ruby_file_location}>"
 msgstr ""
 
-#: ../lib/puppet/functions.rb:644
+#: ../lib/puppet/functions.rb:643
 msgid ""
 "Expected a type alias assignment on the form 'AliasType = T', got '%{assignment_string}'.\n"
 "Called from <%{ruby_file_location}>"
@@ -4538,11 +4546,11 @@ msgstr ""
 msgid "%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:178
+#: ../lib/puppet/parser/functions.rb:176
 msgid "custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:276
+#: ../lib/puppet/parser/functions.rb:274
 msgid "%{name}() can only be called using the 4.x function API. See Scope#call_function"
 msgstr ""
 
@@ -4946,7 +4954,7 @@ msgstr ""
 msgid "Can only delete from an Array or Hash."
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/external_syntax_support.rb:22 ../lib/puppet/pops/evaluator/runtime3_support.rb:23 ../lib/puppet/pops/evaluator/runtime3_support.rb:525
+#: ../lib/puppet/pops/evaluator/external_syntax_support.rb:22 ../lib/puppet/pops/evaluator/runtime3_support.rb:23 ../lib/puppet/pops/evaluator/runtime3_support.rb:526
 msgid "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
 msgstr ""
 
@@ -5820,18 +5828,6 @@ msgstr ""
 msgid "The code loaded from %{source_ref} did not produce a Function class when evaluated. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:17
-msgid "The code loaded from %{source_ref} does not seem to be a Puppet 3x API function - no 'newfunction' call."
-msgstr ""
-
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:36
-msgid "The code loaded from %{source_ref} did not produce the expected 3x function info Hash when evaluated. Got '%{klass}'"
-msgstr ""
-
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:39
-msgid "The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got %{created_name}"
-msgstr ""
-
 #: ../lib/puppet/pops/loader/task_instantiator.rb:16
 msgid "Only one file can exists besides the .json file for task %{name} in directory %{directory}"
 msgstr ""
@@ -6536,7 +6532,7 @@ msgstr ""
 msgid "aix.object_info(): Could not find %{resource}[%{name}]"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:180 ../lib/puppet/provider/nameservice/directoryservice.rb:423
+#: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:180 ../lib/puppet/provider/nameservice/directoryservice.rb:421
 msgid "Could not create %{resource} %{name}: %{detail}"
 msgstr ""
 
@@ -6684,7 +6680,7 @@ msgstr ""
 msgid "No AIX group exists with a group name or gid of %{group}!"
 msgstr ""
 
-#: ../lib/puppet/provider/group/groupadd.rb:13 ../lib/puppet/provider/group/pw.rb:17
+#: ../lib/puppet/provider/group/groupadd.rb:13 ../lib/puppet/provider/group/pw.rb:14
 msgid "GID must be an integer"
 msgstr ""
 
@@ -6816,7 +6812,7 @@ msgstr ""
 msgid "autogen_id() does not support auto generation of id for resource type %{resource_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:169 ../lib/puppet/provider/nameservice/directoryservice.rb:378
+#: ../lib/puppet/provider/nameservice.rb:169 ../lib/puppet/provider/nameservice/directoryservice.rb:376
 msgid "already exists"
 msgstr ""
 
@@ -6828,7 +6824,7 @@ msgstr ""
 msgid "Nameservice command must be an array"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:282 ../lib/puppet/provider/nameservice/directoryservice.rb:337 ../lib/puppet/provider/nameservice/directoryservice.rb:368
+#: ../lib/puppet/provider/nameservice.rb:282 ../lib/puppet/provider/nameservice/directoryservice.rb:337 ../lib/puppet/provider/nameservice/directoryservice.rb:366
 msgid "Could not set %{param} on %{resource}[%{name}]: %{detail}"
 msgstr ""
 
@@ -6853,15 +6849,15 @@ msgstr ""
 msgid "Invalid id_type %{id_type}. Only 'uid' and 'gid' supported"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:395
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:393
 msgid "Could not set GeneratedUID for %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:443
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:441
 msgid "Could not remove %{member} from group: %{resource}, %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:457
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:455
 msgid "Could not add %{new_member} to group: %{name}, %{detail}"
 msgstr ""
 
@@ -7555,23 +7551,23 @@ msgstr ""
 msgid "Could not create class file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:571
+#: ../lib/puppet/resource/catalog.rb:567
 msgid "Could not create resource file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:593
+#: ../lib/puppet/resource/catalog.rb:589
 msgid "Unknown ordering type %{ordering}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:614
+#: ../lib/puppet/resource/catalog.rb:610
 msgid "Duplicate declaration: %{resource} is already declared; cannot redeclare"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:616
+#: ../lib/puppet/resource/catalog.rb:612
 msgid "Duplicate declaration: %{resource} is already declared at %{error_location}; cannot redeclare"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:664 ../lib/puppet/resource/catalog.rb:668
+#: ../lib/puppet/resource/catalog.rb:660 ../lib/puppet/resource/catalog.rb:664
 msgid "Could not find resource %{resource} when converting %{message} resources"
 msgstr ""
 
@@ -8702,26 +8698,14 @@ msgstr ""
 msgid "Could not create %{type} filebucket: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/group.rb:61
+#: ../lib/puppet/type/group.rb:60
 msgid "GID cannot be deleted"
 msgstr ""
 
-#: ../lib/puppet/type/group.rb:73
+#: ../lib/puppet/type/group.rb:72
 msgid "Invalid GID %{gid}"
 msgstr ""
 
-#: ../lib/puppet/type/group.rb:92
-msgid "The members property must be specified as either an array of strings, or as a single string consisting of a comma-separated list of members"
-msgstr ""
-
-#: ../lib/puppet/type/group.rb:96
-msgid "User names must be provided, not UID numbers."
-msgstr ""
-
-#: ../lib/puppet/type/group.rb:100
-msgid "User names must not be empty. If you want to specify \"no users\" pass an empty array"
-msgstr ""
-
 #: ../lib/puppet/type/host.rb:32
 msgid "Invalid IP address %{value}"
 msgstr ""
@@ -8989,61 +8973,61 @@ msgstr ""
 msgid "Group names must not be empty. If you want to specify \"no groups\" pass an empty array"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:432
+#: ../lib/puppet/type/user.rb:435
 msgid "User provider %{name} can not manage home directories"
 msgstr ""
 
 #. TRANSLATORS YYYY-MM-DD represents a date with a four-digit year, a two-digit month, and a two-digit day,
 #. TRANSLATORS separated by dashes.
-#: ../lib/puppet/type/user.rb:449
+#: ../lib/puppet/type/user.rb:452
 msgid "Expiry dates must be YYYY-MM-DD or the string \"absent\""
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:526
+#: ../lib/puppet/type/user.rb:529
 msgid "Role names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:528
+#: ../lib/puppet/type/user.rb:531
 msgid "Role names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:563
+#: ../lib/puppet/type/user.rb:566
 msgid "Auth names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:565
+#: ../lib/puppet/type/user.rb:568
 msgid "Auth names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:589
+#: ../lib/puppet/type/user.rb:592
 msgid "Profile names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:591
+#: ../lib/puppet/type/user.rb:594
 msgid "Profile names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:714
+#: ../lib/puppet/type/user.rb:717
 msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:717
+#: ../lib/puppet/type/user.rb:720
 msgid "Paths to keyfiles must be absolute, not %{entry}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:721
+#: ../lib/puppet/type/user.rb:724
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:733
+#: ../lib/puppet/type/user.rb:736
 msgid "purge_ssh_keys can only be true for users with a defined home directory"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:740
+#: ../lib/puppet/type/user.rb:743
 msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:754
+#: ../lib/puppet/type/user.rb:757
 msgid "Class name must be provided."
 msgstr ""
 
@@ -9154,11 +9138,11 @@ msgstr ""
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:564
+#: ../lib/puppet/util.rb:568
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:568
+#: ../lib/puppet/util.rb:572
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -9535,23 +9519,23 @@ msgstr ""
 msgid "Writing %{path} to RAM"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:178
+#: ../lib/puppet/util/filetype.rb:184
 msgid "Could not retrieve user %{user}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:233 ../lib/puppet/util/filetype.rb:276
+#: ../lib/puppet/util/filetype.rb:200 ../lib/puppet/util/filetype.rb:249 ../lib/puppet/util/filetype.rb:292
 msgid "User %{path} not authorized to use cron"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:235 ../lib/puppet/util/filetype.rb:278
+#: ../lib/puppet/util/filetype.rb:202 ../lib/puppet/util/filetype.rb:251 ../lib/puppet/util/filetype.rb:294
 msgid "Could not read crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:243 ../lib/puppet/util/filetype.rb:286
+#: ../lib/puppet/util/filetype.rb:259 ../lib/puppet/util/filetype.rb:302
 msgid "Could not remove crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:258 ../lib/puppet/util/filetype.rb:302
+#: ../lib/puppet/util/filetype.rb:274 ../lib/puppet/util/filetype.rb:318
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
@@ -9674,7 +9658,7 @@ msgstr ""
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:100
+#: ../lib/puppet/util/log/destinations.rb:101
 msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
 msgstr ""