diff options
| author | Thom May <thom@may.lt> | 2015-05-20 18:26:04 +0100 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2015-05-20 18:26:04 +0100 |
| commit | c8462b7818f4d5eef70074edfafde20f95105a56 (patch) | |
| tree | 00589dada28960d8cb0cb58184038f9052eb4695 | |
| parent | 9faac04ee3231fc28b25ee73fc74b1e0fbdcc4a7 (diff) | |
| parent | 93f0426a0ef8daa59c697c65e82e8d022bb1e6c8 (diff) | |
| download | chef-c8462b7818f4d5eef70074edfafde20f95105a56.tar.gz | |
Merge pull request #3402 from chef/jdm/winnetfix
Don't call get_last_error for net api
| -rw-r--r-- | lib/chef/win32/net.rb | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/lib/chef/win32/net.rb b/lib/chef/win32/net.rb index 0bb4d12bd4..1349091eb9 100644 --- a/lib/chef/win32/net.rb +++ b/lib/chef/win32/net.rb @@ -117,11 +117,7 @@ END rc = NetUserAdd(server_name, 3, buf, nil) if rc != NERR_Success - if Chef::ReservedNames::Win32::Error.get_last_error != 0 - Chef::ReservedNames::Win32::Error.raise! - else - net_api_error!(rc) - end + net_api_error!(rc) end end @@ -134,11 +130,7 @@ END rc = NetUserGetInfo(server_name, user_name, 3, ui3_p) if rc != NERR_Success - if Chef::ReservedNames::Win32::Error.get_last_error != 0 - Chef::ReservedNames::Win32::Error.raise! - else - net_api_error!(rc) - end + net_api_error!(rc) end ui3 = USER_INFO_3.new(ui3_p.read_pointer).as_ruby @@ -146,11 +138,7 @@ END rc = NetApiBufferFree(ui3_p.read_pointer) if rc != NERR_Success - if Chef::ReservedNames::Win32::Error.get_last_error != 0 - Chef::ReservedNames::Win32::Error.raise! - else - net_api_error!(rc) - end + net_api_error!(rc) end ui3 @@ -168,11 +156,7 @@ END rc = NetUserSetInfo(server_name, user_name, 3, buf, nil) if rc != NERR_Success - if Chef::ReservedNames::Win32::Error.get_last_error != 0 - Chef::ReservedNames::Win32::Error.raise! - else - net_api_error!(rc) - end + net_api_error!(rc) end end @@ -182,11 +166,7 @@ END rc = NetUserDel(server_name, user_name) if rc != NERR_Success - if Chef::ReservedNames::Win32::Error.get_last_error != 0 - Chef::ReservedNames::Win32::Error.raise! - else - net_api_error!(rc) - end + net_api_error!(rc) end end @@ -201,11 +181,7 @@ END rc = NetLocalGroupAddMembers(server_name, group_name, 3, buf, 1) if rc != NERR_Success - if Chef::ReservedNames::Win32::Error.get_last_error != 0 - Chef::ReservedNames::Win32::Error.raise! - else - net_api_error!(rc) - end + net_api_error!(rc) end end |