puppet 5.5.20 → 5.5.21

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

@@ -140,12 +140,7 @@ class Puppet::Util::Windows::EventLog
   # @api private
   def from_string_to_wide_string(str, &block)
     str = wide_string(str)
-    FFI::MemoryPointer.new(:uchar, str.bytesize) do |ptr|
-      # uchar here is synonymous with byte
-      ptr.put_array_of_uchar(0, str.bytes.to_a)
-
-      yield ptr
-    end
+    FFI::MemoryPointer.from_wide_string(str) { |ptr| yield ptr }
 
     # ptr has already had free called, so nothing to return
     nil

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

@@ -41,6 +41,7 @@ module Puppet::Util::Windows::SID
     # = 8 + max sub identifiers (15) * 4
     MAXIMUM_SID_BYTE_LENGTH = 68
 
+    ERROR_INVALID_PARAMETER   = 87
     ERROR_INSUFFICIENT_BUFFER = 122
 
     def self.lookup_account_name(system_name = nil, account_name)
@@ -48,9 +49,7 @@ module Puppet::Util::Windows::SID
       begin
         if system_name
           system_name_wide = Puppet::Util::Windows::String.wide_string(system_name)
-          # uchar here is synonymous with byte
-          system_name_ptr = FFI::MemoryPointer.new(:byte, system_name_wide.bytesize)
-          system_name_ptr.put_array_of_uchar(0, system_name_wide.bytes.to_a)
+          system_name_ptr = FFI::MemoryPointer.from_wide_string(system_name_wide)
         end
 
         FFI::MemoryPointer.from_string_to_wide_string(account_name) do |account_name_ptr|
@@ -101,9 +100,7 @@ module Puppet::Util::Windows::SID
       begin
         if system_name
           system_name_wide = Puppet::Util::Windows::String.wide_string(system_name)
-          # uchar here is synonymous with byte
-          system_name_ptr = FFI::MemoryPointer.new(:byte, system_name_wide.bytesize)
-          system_name_ptr.put_array_of_uchar(0, system_name_wide.bytes.to_a)
+          system_name_ptr = FFI::MemoryPointer.from_wide_string(system_name_wide)
         end
 
         FFI::MemoryPointer.new(:byte, sid_bytes.length) do |sid_ptr|
@@ -112,6 +109,11 @@ module Puppet::Util::Windows::SID
               FFI::MemoryPointer.new(:uint32, 1) do |name_use_enum_ptr|
 
                 sid_ptr.write_array_of_uchar(sid_bytes)
+
+                if Puppet::Util::Windows::SID.IsValidSid(sid_ptr) == FFI::WIN32_FALSE
+                  raise Puppet::Util::Windows::Error.new(_('Byte array for lookup_account_sid is invalid: %{sid_bytes}') % { sid_bytes: sid_bytes }, ERROR_INVALID_PARAMETER)
+                end
+
                 success = LookupAccountSidW(system_name_ptr, sid_ptr, FFI::Pointer::NULL, name_length_ptr,
                   FFI::Pointer::NULL, domain_length_ptr, name_use_enum_ptr)
                 last_error = FFI.errno

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

@@ -110,13 +110,16 @@ module Puppet::Util::Windows
 
     private
 
-    def reg_enum_key(key, index, max_key_length = Win32::Registry::Constants::MAX_KEY_LENGTH)
+    # max number of wide characters including NULL terminator
+    MAX_KEY_CHAR_LENGTH = 255 + 1
+
+    def reg_enum_key(key, index, max_key_char_length = MAX_KEY_CHAR_LENGTH)
       subkey, filetime = nil, nil
 
       FFI::MemoryPointer.new(:dword) do |subkey_length_ptr|
         FFI::MemoryPointer.new(FFI::WIN32::FILETIME.size) do |filetime_ptr|
-          FFI::MemoryPointer.new(:wchar, max_key_length) do |subkey_ptr|
-            subkey_length_ptr.write_dword(max_key_length)
+          FFI::MemoryPointer.new(:wchar, max_key_char_length) do |subkey_ptr|
+            subkey_length_ptr.write_dword(max_key_char_length)
 
             # RegEnumKeyEx cannot be called twice to properly size the buffer
             result = RegEnumKeyExW(key.hkey, index,
@@ -141,7 +144,10 @@ module Puppet::Util::Windows
       [subkey, filetime]
     end
 
-    def reg_enum_value(key, index, max_value_length = Win32::Registry::Constants::MAX_VALUE_LENGTH)
+    # max number of wide characters including NULL terminator
+    MAX_VALUE_CHAR_LENGTH = 16383 + 1
+
+    def reg_enum_value(key, index, max_value_length = MAX_VALUE_CHAR_LENGTH)
       subkey, type, data = nil, nil, nil
 
       FFI::MemoryPointer.new(:dword) do |subkey_length_ptr|
@@ -234,7 +240,7 @@ module Puppet::Util::Windows
         begin
           case type
             when Win32::Registry::REG_SZ, Win32::Registry::REG_EXPAND_SZ
-              result = [ type, sanitize(data_ptr.read_wide_string(string_length)) ]
+              result = [ type, data_ptr.read_wide_string(string_length, Encoding::UTF_8, true) ]
             when Win32::Registry::REG_MULTI_SZ
               result = [ type, data_ptr.read_wide_string(string_length).split(/\0/) ]
             when Win32::Registry::REG_BINARY
@@ -314,12 +320,6 @@ module Puppet::Util::Windows
       result
     end
 
-    def sanitize(value)
-      # Replace null bytes with a space
-      value.tr!("\x00", ' ')
-      value
-    end
-
     ffi_convention :stdcall
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724862(v=vs.85).aspx

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.20'
+  PUPPETVERSION = '5.5.21'
 
   ##
   # 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.19-48-g3415147ded\n"
+"Project-Id-Version: Puppet automation framework 5.5.20-62-g352a8c16bd\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-04-24 10:01+0000\n"
-"PO-Revision-Date: 2020-04-24 10:01+0000\n"
+"POT-Creation-Date: 2020-06-19 16:16+0000\n"
+"PO-Revision-Date: 2020-06-19 16:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -176,19 +176,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:372
+#: ../lib/puppet/application/agent.rb:374
 msgid "Fingerprint asked but no certificate nor certificate request have yet been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:377
+#: ../lib/puppet/application/agent.rb:379
 msgid "Could not get fingerprint for digest '%{digest}'"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:401
+#: ../lib/puppet/application/agent.rb:403
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:417
+#: ../lib/puppet/application/agent.rb:419
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -4090,19 +4090,19 @@ msgstr ""
 msgid "Not a valid indirection type"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:11
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:14
 msgid "%{env_name} is not a known environment"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:40
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:43
 msgid "Application %{application} assigns nodes to non-existent components: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:46
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:49
 msgid "Application %{application} has components without assigned nodes: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:55
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:58
 msgid "Application %{app} assigns multiple nodes to component %{comp}"
 msgstr ""
 
@@ -4398,7 +4398,7 @@ msgid "For more information, see https://puppet.com/docs/puppet/latest/environme
 msgstr ""
 
 #. TRANSLATORS "stage" is a keyword in Puppet and should not be translated
-#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:134
+#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:137
 msgid "Only classes can set 'stage'; normal resources like %{resource} cannot change run stage"
 msgstr ""
 
@@ -4533,11 +4533,11 @@ msgstr ""
 msgid "For initializing compiler"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:17
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:19
 msgid "Capability '%{cap}' referenced by '%{param}' is never exported"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:56
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:58
 msgid "'%{value}' is exported by both '%{hash}' and '%{resource}'"
 msgstr ""
 
@@ -4549,55 +4549,55 @@ msgstr ""
 msgid "Could not find resource '%{res}' in parameter '%{param}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:14
+#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:16
 msgid "Only application components can appear inside a site - %{res} is not allowed"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:12
+#: ../lib/puppet/parser/environment_compiler.rb:13
 msgid "%{detail} in environment %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:59
+#: ../lib/puppet/parser/environment_compiler.rb:62
 msgid "For compiling environment catalog %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:62
+#: ../lib/puppet/parser/environment_compiler.rb:65
 msgid "Env Compile: Created settings scope"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:64
+#: ../lib/puppet/parser/environment_compiler.rb:67
 msgid "Env Compile: Evaluated main"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:66
+#: ../lib/puppet/parser/environment_compiler.rb:69
 msgid "Env Compile: Evaluated site"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:68
+#: ../lib/puppet/parser/environment_compiler.rb:71
 msgid "Env Compile: Evaluated application instances"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:70
+#: ../lib/puppet/parser/environment_compiler.rb:73
 msgid "Env Compile: Prune"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:72
+#: ../lib/puppet/parser/environment_compiler.rb:75
 msgid "Env Compile: Validate Catalog pre-finish"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:76
+#: ../lib/puppet/parser/environment_compiler.rb:79
 msgid "Env Compile: Finished catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:80
+#: ../lib/puppet/parser/environment_compiler.rb:83
 msgid "Env Compile: Validate Catalog final"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:156
+#: ../lib/puppet/parser/environment_compiler.rb:159
 msgid "Environment Compiler: Could not find a site definition to evaluate"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:162
+#: ../lib/puppet/parser/environment_compiler.rb:165
 msgid "Evaluated application %{resource}"
 msgstr ""
 
@@ -4755,23 +4755,23 @@ msgstr ""
 msgid "Attempt to reassign attribute '%{name}' in '%{resource}' caused by multiple consumed mappings to the same attribute"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:362
+#: ../lib/puppet/parser/resource.rb:363
 msgid "Parameter '%{name}' is already set on %{resource}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:365
+#: ../lib/puppet/parser/resource.rb:366
 msgid "Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:370
+#: ../lib/puppet/parser/resource.rb:371
 msgid "Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:373
+#: ../lib/puppet/parser/resource.rb:374
 msgid "Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:412
+#: ../lib/puppet/parser/resource.rb:413
 msgid "Duplicate parameter '%{param}' for on %{resource}"
 msgstr ""
 
@@ -5793,6 +5793,10 @@ msgstr ""
 msgid "Failed to load: %{type_name}"
 msgstr ""
 
+#: ../lib/puppet/pops/issues.rb:918
+msgid "Use of the application-orchestration %{expr} is deprecated. See https://puppet.com/docs/puppet/5.5/deprecated_language.html"
+msgstr ""
+
 #: ../lib/puppet/pops/label_provider.rb:76
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
@@ -6162,7 +6166,7 @@ msgstr ""
 msgid "digit expected"
 msgstr ""
 
-#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:428
+#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:432
 msgid "you must specify title patterns when there are two or more key attributes"
 msgstr ""
 
@@ -7006,7 +7010,7 @@ msgstr ""
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:235 ../lib/puppet/provider/package/zypper.rb:109
+#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:235 ../lib/puppet/provider/package/zypper.rb:110
 msgid "Could not find package %{name}"
 msgstr ""
 
@@ -7699,67 +7703,67 @@ msgstr ""
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:78
+#: ../lib/puppet/resource/type.rb:81
 msgid "Invalid export in %{reference}: %{ex} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:79
+#: ../lib/puppet/resource/type.rb:82
 msgid "Invalid export in %{reference}: %{ex} is not a capability resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:83
+#: ../lib/puppet/resource/type.rb:86
 msgid "Resource type %{res_type} does not produce %{ex_type}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:143
+#: ../lib/puppet/resource/type.rb:146
 msgid "Invalid resource supertype '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:190
+#: ../lib/puppet/resource/type.rb:197
 msgid "%{name} is not a class; cannot add code to it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:191
+#: ../lib/puppet/resource/type.rb:198
 msgid "%{name} is not a class; cannot add code from it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:195
+#: ../lib/puppet/resource/type.rb:202
 msgid "Cannot have code outside of a class/node/define because 'freeze_main' is enabled"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:199
+#: ../lib/puppet/resource/type.rb:206
 msgid "Cannot merge classes with different parent classes (%{name} => %{parent} vs. %{other_name} => %{other_parent})"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:230
+#: ../lib/puppet/resource/type.rb:237
 msgid "Cannot create resources for defined resource types"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:284
+#: ../lib/puppet/resource/type.rb:292
 msgid "The method Puppet::Resource::Type.assign_parameter_values is deprecated and will be removed in the next major release of Puppet."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:300
+#: ../lib/puppet/resource/type.rb:308
 msgid "Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:427
+#: ../lib/puppet/resource/type.rb:435
 msgid "Parameter '%{name}' is given a type, but is not a valid parameter."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:430
+#: ../lib/puppet/resource/type.rb:438
 msgid "Parameter '%{name}' is given a type that is not a Puppet Type, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:470
+#: ../lib/puppet/resource/type.rb:478
 msgid "Could not find scope for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:491
+#: ../lib/puppet/resource/type.rb:499
 msgid "%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:493
+#: ../lib/puppet/resource/type.rb:501
 msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
 msgstr ""
 
@@ -8543,77 +8547,77 @@ msgstr ""
 msgid "audit change: newly-recorded value %s"
 msgstr ""
 
-#: ../lib/puppet/type.rb:503
+#: ../lib/puppet/type.rb:507
 msgid "Options must be a hash, not %{type}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:506
+#: ../lib/puppet/type.rb:510
 msgid "Class %{class_name} already has a property named %{property}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:592
+#: ../lib/puppet/type.rb:596
 msgid "Class %{class_name} has not defined parameters"
 msgstr ""
 
-#: ../lib/puppet/type.rb:676
+#: ../lib/puppet/type.rb:680
 msgid "Parameter %{name} failed on %{ref}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:699
+#: ../lib/puppet/type.rb:703
 msgid "Undefined attribute '%{attribute}' in %{name}"
 msgstr ""
 
 #. TRANSLATORS 'is' is a variable name and should not be translated
 #. TRANSLATORS 'is' is a variable name and should not be translated
-#: ../lib/puppet/type.rb:1022 ../lib/puppet/type.rb:1033
+#: ../lib/puppet/type.rb:1026 ../lib/puppet/type.rb:1037
 msgid "The 'is' value is not in the 'is' array for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1159
+#: ../lib/puppet/type.rb:1163
 msgid "%{name} has no providers and has not overridden 'instances'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1418
+#: ../lib/puppet/type.rb:1422
 msgid "Cannot add aliases without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1497
+#: ../lib/puppet/type.rb:1501
 msgid "Could not find %{description} %{ref} for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1770
+#: ../lib/puppet/type.rb:1776
 msgid "Found multiple default providers for %{name}: %{provider_list}; using %{selected_provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1855
+#: ../lib/puppet/type.rb:1861
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1929
+#: ../lib/puppet/type.rb:1935
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2012
+#: ../lib/puppet/type.rb:2018
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2129
+#: ../lib/puppet/type.rb:2135
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2436
+#: ../lib/puppet/type.rb:2442
 msgid "Unable to mark '%{name}' as sensitive: %{name} is a parameter and not a property, and cannot be automatically redacted."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2439
+#: ../lib/puppet/type.rb:2445
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2441
+#: ../lib/puppet/type.rb:2447
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2499
+#: ../lib/puppet/type.rb:2505
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8934,27 +8938,35 @@ msgstr ""
 msgid "name must not contain whitespace: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:118 ../lib/puppet/type/package.rb:132
+#: ../lib/puppet/type/package.rb:125 ../lib/puppet/type/package.rb:139
 msgid "Could not update: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:167
+#: ../lib/puppet/type/package.rb:174
 msgid "Could not get latest version: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:267
+#: ../lib/puppet/type/package.rb:274
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:503
+#: ../lib/puppet/type/package.rb:416
+msgid "Cannot have both `ensure => disabled` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:515
 msgid "Cannot have both `enable_only => true` and `flavor`"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:655
+#: ../lib/puppet/type/package.rb:518
+msgid "Cannot have both `ensure => disabled` and `enable_only => true`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:670
 msgid "Invalid hold value %{value}. %{doc}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:685
+#: ../lib/puppet/type/package.rb:700
 msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
 msgstr ""
 
@@ -9026,7 +9038,7 @@ msgstr ""
 msgid "Invalid value %{value}. %{doc}"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:94
+#: ../lib/puppet/type/service.rb:88
 msgid "Setting enable to %{value} is only supported on Microsoft Windows."
 msgstr ""
 
@@ -9163,15 +9175,7 @@ msgstr ""
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:724
-msgid "purge_ssh_keys can only be true for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:731
-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:745
+#: ../lib/puppet/type/user.rb:739
 msgid "Class name must be provided."
 msgstr ""
 
@@ -9810,10 +9814,6 @@ msgstr ""
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:101
-msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
-msgstr ""
-
 #: ../lib/puppet/util/logging.rb:80 ../lib/puppet/util/logging.rb:104
 msgid "Wrapped exception:"
 msgstr ""
@@ -10161,11 +10161,11 @@ msgstr ""
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:72
+#: ../lib/puppet/util/windows/api_types.rb:79
 msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:203
+#: ../lib/puppet/util/windows/api_types.rb:210
 msgid "Bad GUID format."
 msgstr ""
 
@@ -10220,16 +10220,20 @@ msgstr ""
 msgid "Failed to call GetLongPathName"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:68 ../lib/puppet/util/windows/principal.rb:75
+#: ../lib/puppet/util/windows/principal.rb:69 ../lib/puppet/util/windows/principal.rb:76
 msgid "Failed to call LookupAccountNameW with account: %{account_name}"
 msgstr ""
 
 #. TRANSLATORS `lookup_account_sid` is a variable name and should not be translated
-#: ../lib/puppet/util/windows/principal.rb:98
+#: ../lib/puppet/util/windows/principal.rb:99
 msgid "Byte array for lookup_account_sid must not be nil and must be at least 1 byte long"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:120 ../lib/puppet/util/windows/principal.rb:127
+#: ../lib/puppet/util/windows/principal.rb:118
+msgid "Byte array for lookup_account_sid is invalid: %{sid_bytes}"
+msgstr ""
+
+#: ../lib/puppet/util/windows/principal.rb:126 ../lib/puppet/util/windows/principal.rb:133
 msgid "Failed to call LookupAccountSidW with bytes: %{sid_bytes}"
 msgstr ""