set_errno() fixes
Pierre A. Humblet
Pierre.Humblet@ieee.org
Thu May 16 18:01:00 GMT 2002
2002-05-16 Pierre Humblet <pierre.humblet@ieee.org>
* fhandler_raw.cc (fhandler_dev_raw::open): Replace set_errno()
by __seterrno_from_win_error().
* security.cc (open_local_policy): Ditto. (get_lsa_srv_inf): Ditto.
(get_user_groups): Ditto. (get_user_primary_group): Ditto.
(create_token): Ditto. (subauth): Ditto.
I have also removed some debug_printf() when the printf()'s from
__seterrno_from_win_error() are unambiguous.
Pierre
-------------- next part --------------
--- security.cc.orig Thu May 16 20:04:36 2002
+++ security.cc Thu May 16 20:24:14 2002
@@ -184,7 +184,7 @@
NTSTATUS ret = LsaOpenPolicy(NULL, &oa, POLICY_EXECUTE, &lsa);
if (ret != STATUS_SUCCESS)
- set_errno (LsaNtStatusToWinError (ret));
+ __seterrno_from_win_error (LsaNtStatusToWinError (ret));
return lsa;
}
@@ -210,7 +210,7 @@
if ((ret = LsaQueryInformationPolicy (lsa, PolicyAccountDomainInformation,
(PVOID *) &adi)) != STATUS_SUCCESS)
{
- set_errno (LsaNtStatusToWinError(ret));
+ __seterrno_from_win_error (LsaNtStatusToWinError(ret));
return FALSE;
}
lsa2wchar (account, adi->DomainName, INTERNET_MAX_HOST_NAME_LENGTH + 1);
@@ -218,7 +218,7 @@
if ((ret = LsaQueryInformationPolicy (lsa, PolicyPrimaryDomainInformation,
(PVOID *) &pdi)) != STATUS_SUCCESS)
{
- set_errno (LsaNtStatusToWinError(ret));
+ __seterrno_from_win_error (LsaNtStatusToWinError(ret));
return FALSE;
}
lsa2wchar (primary, pdi->Name, INTERNET_MAX_HOST_NAME_LENGTH + 1);
@@ -282,8 +282,7 @@
MAX_PREFERRED_LENGTH, &cnt, &tot);
if (ret)
{
- debug_printf ("%d = NetUserGetGroups ()", ret);
- set_errno (ret);
+ __seterrno_from_win_error (ret);
/* It's no error when the user name can't be found. */
return ret == NERR_UserNotFound;
}
@@ -356,8 +355,7 @@
MAX_PREFERRED_LENGTH, &cnt, &tot, NULL);
if (ret)
{
- debug_printf ("%d = NetLocalGroupEnum ()", ret);
- set_errno (ret);
+ __seterrno_from_win_error (ret);
return FALSE;
}
@@ -434,8 +432,7 @@
ret = NetUserGetInfo (NULL, wuser, 3, (LPBYTE *) &buf);
if (ret)
{
- debug_printf ("%d = NetUserGetInfo ()", ret);
- set_errno (ret);
+ __seterrno_from_win_error (ret);
return FALSE;
}
@@ -848,7 +845,7 @@
&auth_luid, &exp, &user, grps, privs, &owner, &pgrp,
&dacl, &source);
if (ret)
- set_errno (RtlNtStatusToDosError (ret));
+ __seterrno_from_win_error (RtlNtStatusToDosError (ret));
else if (GetLastError () == ERROR_PROC_NOT_FOUND)
{
__seterrno ();
@@ -929,7 +926,7 @@
if (ret != STATUS_SUCCESS)
{
debug_printf ("LsaRegisterLogonProcess: %d", ret);
- set_errno (LsaNtStatusToWinError(ret));
+ __seterrno_from_win_error (LsaNtStatusToWinError(ret));
goto out;
}
else if (GetLastError () == ERROR_PROC_NOT_FOUND)
@@ -943,7 +940,7 @@
if (ret != STATUS_SUCCESS)
{
debug_printf ("LsaLookupAuthenticationPackage: %d", ret);
- set_errno (LsaNtStatusToWinError(ret));
+ __seterrno_from_win_error (LsaNtStatusToWinError(ret));
LsaDeregisterLogonProcess(lsa_hdl);
goto out;
}
@@ -972,7 +969,7 @@
if (ret != STATUS_SUCCESS)
{
debug_printf ("LsaLogonUser: %d", ret);
- set_errno (LsaNtStatusToWinError(ret));
+ __seterrno_from_win_error (LsaNtStatusToWinError(ret));
LsaDeregisterLogonProcess(lsa_hdl);
goto out;
}
-------------- next part --------------
--- fhandler_raw.cc.orig Thu May 16 19:59:56 2002
+++ fhandler_raw.cc Thu May 16 20:20:18 2002
@@ -171,8 +171,7 @@
FILE_SYNCHRONOUS_IO_NONALERT);
if (!NT_SUCCESS (status))
{
- set_errno (RtlNtStatusToDosError (status));
- debug_printf ("NtOpenFile: NTSTATUS: %d, Win32: %E", status);
+ __seterrno_from_win_error (RtlNtStatusToDosError (status));
return 0;
}
More information about the Cygwin-patches
mailing list