From 5c1f639eb084793850f4e4bc923577cf3b419563 Mon Sep 17 00:00:00 2001 From: corinna Date: Mon, 15 Dec 2008 20:25:44 +0000 Subject: [PATCH] * sec_auth.cc (open_local_policy): Set lsa handle to INVALID_HANDLE_VALUE when LsaOpenPolicy fails. Explain why. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/sec_auth.cc | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fdaaf2b99a..2909ce10d7 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2008-12-15 Corinna Vinschen + * sec_auth.cc (open_local_policy): Set lsa handle to + INVALID_HANDLE_VALUE when LsaOpenPolicy fails. Explain why. + +2008-12-15 Corinna Vinschen + * setlsapwd.cc (setlsapwd): Simplify code. Only try to call cygserver if opening local policy fails. Don't treat removing non-existant private data as error. diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc index f01abf9128..0e2dde6897 100644 --- a/winsup/cygwin/sec_auth.cc +++ b/winsup/cygwin/sec_auth.cc @@ -159,7 +159,12 @@ open_local_policy (ACCESS_MASK access) NTSTATUS ret = LsaOpenPolicy (NULL, &oa, access, &lsa); if (ret != STATUS_SUCCESS) - __seterrno_from_win_error (LsaNtStatusToWinError (ret)); + { + __seterrno_from_win_error (LsaNtStatusToWinError (ret)); + /* Some versions of Windows set the lsa handle to NULL when + LsaOpenPolicy fails. */ + lsa = INVALID_HANDLE_VALUE; + } return lsa; } -- 2.11.0