diff options
| -rw-r--r-- | lib/chef/resource/remote_file.rb | 8 | ||||
| -rw-r--r-- | lib/chef/util/windows/logon_session.rb | 2 | ||||
| -rw-r--r-- | spec/unit/util/windows/logon_session_spec.rb | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb index bd0cf03360..25586af702 100644 --- a/lib/chef/resource/remote_file.rb +++ b/lib/chef/resource/remote_file.rb @@ -137,14 +137,6 @@ class Chef property :remote_password, String, sensitive: true - def sensitive(args = nil) - if remote_password - true - else - super - end - end - def after_created validate_identity_platform(remote_user, remote_password, remote_domain) identity = qualify_user(remote_user, remote_password, remote_domain) diff --git a/lib/chef/util/windows/logon_session.rb b/lib/chef/util/windows/logon_session.rb index adabdbb3ef..ef80b113b1 100644 --- a/lib/chef/util/windows/logon_session.rb +++ b/lib/chef/util/windows/logon_session.rb @@ -47,7 +47,7 @@ class Chef password = wstring(original_password) domain = wstring(original_domain) - status = Chef::ReservedNames::Win32::API::Security.LogonUserW(username, domain, password, Chef::ReservedNames::Win32::API::Security::LOGON32_LOGON_NETWORK, Chef::ReservedNames::Win32::API::Security::LOGON32_PROVIDER_DEFAULT, token) + status = Chef::ReservedNames::Win32::API::Security.LogonUserW(username, domain, password, Chef::ReservedNames::Win32::API::Security::LOGON32_LOGON_NEW_CREDENTIALS, Chef::ReservedNames::Win32::API::Security::LOGON32_PROVIDER_DEFAULT, token) if !status last_error = FFI::LastError.error diff --git a/spec/unit/util/windows/logon_session_spec.rb b/spec/unit/util/windows/logon_session_spec.rb index 7c5e7c76c9..b9b6c458b6 100644 --- a/spec/unit/util/windows/logon_session_spec.rb +++ b/spec/unit/util/windows/logon_session_spec.rb @@ -22,7 +22,7 @@ require "chef/util/windows/logon_session" describe ::Chef::Util::Windows::LogonSession do before do stub_const("Chef::ReservedNames::Win32::API::Security", Class.new) - stub_const("Chef::ReservedNames::Win32::API::Security::LOGON32_LOGON_NETWORK", 314) + stub_const("Chef::ReservedNames::Win32::API::Security::LOGON32_LOGON_NEW_CREDENTIALS", 314) stub_const("Chef::ReservedNames::Win32::API::Security::LOGON32_PROVIDER_DEFAULT", 159) stub_const("Chef::ReservedNames::Win32::API::System", Class.new ) end |