summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2008-12-15 20:25:44 +0000
committerCorinna Vinschen <corinna@vinschen.de>2008-12-15 20:25:44 +0000
commit658fe9ec362b3fb8f53184bdc5966adf78a18d5c (patch)
tree8a012fe93f6abc86c0fb9dd1fa691aa828d1e6df
parent63a89e8464e457b89a1905e2e443edd1c7ff1b02 (diff)
downloadcygnal-658fe9ec362b3fb8f53184bdc5966adf78a18d5c.tar.gz
cygnal-658fe9ec362b3fb8f53184bdc5966adf78a18d5c.tar.bz2
cygnal-658fe9ec362b3fb8f53184bdc5966adf78a18d5c.zip
* sec_auth.cc (open_local_policy): Set lsa handle to
INVALID_HANDLE_VALUE when LsaOpenPolicy fails. Explain why.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/sec_auth.cc7
2 files changed, 11 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fdaaf2b99..2909ce10d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2008-12-15 Corinna Vinschen <corinna@vinschen.de>
+ * sec_auth.cc (open_local_policy): Set lsa handle to
+ INVALID_HANDLE_VALUE when LsaOpenPolicy fails. Explain why.
+
+2008-12-15 Corinna Vinschen <corinna@vinschen.de>
+
* 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 f01abf912..0e2dde689 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;
}