drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
This commit is contained in:
Corinna Vinschen 2008-12-15 18:07:35 +00:00
parent faded04e6c
commit 63a89e8464
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
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.
2008-12-15 Corinna Vinschen <corinna@vinschen.de> 2008-12-15 Corinna Vinschen <corinna@vinschen.de>
* setlsapwd.cc (setlsapwd): Explicitely erase password buffer content * setlsapwd.cc (setlsapwd): Explicitely erase password buffer content

16
winsup/cygwin/setlsapwd.cc
View File

@ -56,8 +56,6 @@ setlsapwd (const char *passwd)
if (!passwd || ! *passwd if (!passwd || ! *passwd
|| sys_mbstowcs_alloc (&data_buf, HEAP_NOTHEAP, passwd)) || sys_mbstowcs_alloc (&data_buf, HEAP_NOTHEAP, passwd))
{ {
NTSTATUS status = STATUS_ACCESS_DENIED;
memset (&data, 0, sizeof data); memset (&data, 0, sizeof data);
if (data_buf) if (data_buf)
RtlInitUnicodeString (&data, data_buf); RtlInitUnicodeString (&data, data_buf);
@ -65,13 +63,19 @@ setlsapwd (const char *passwd)
if ((lsa = open_local_policy (POLICY_CREATE_SECRET)) if ((lsa = open_local_policy (POLICY_CREATE_SECRET))
!= INVALID_HANDLE_VALUE) != INVALID_HANDLE_VALUE)
{ {
status = LsaStorePrivateData (lsa, &key, data.Length ? &data : NULL); NTSTATUS status = LsaStorePrivateData (lsa, &key,
if (NT_SUCCESS (status)) data.Length ? &data : NULL);
/* Success or we're trying to remove a password entry which doesn't
exist. */
if (NT_SUCCESS (status)
|| (data.Length == 0 && status == STATUS_OBJECT_NAME_NOT_FOUND))
ret = 0; ret = 0;
else
__seterrno_from_nt_status (status);
LsaClose (lsa); LsaClose (lsa);
} }
if (ret)
#ifdef USE_SERVER #ifdef USE_SERVER
else if (ret)
{ {
/* If that fails, ask cygserver. */ /* If that fails, ask cygserver. */
client_request_setpwd request (&data); client_request_setpwd request (&data);
@ -80,8 +84,6 @@ setlsapwd (const char *passwd)
else else
ret = 0; ret = 0;
} }
#else
__seterrno_from_nt_status (status);
#endif #endif
if (data_buf) if (data_buf)
{ {