diff options
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/security.cc | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 857f1e714..156f661db 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2006-08-14 Corinna Vinschen <corinna@vinschen.de> + + * security.cc (subauth): Initialize user_token to NULL. Add comment. + 2006-08-11 Corinna Vinschen <corinna@vinschen.de> * shared.cc (open_shared): Desperately try to get shared memory, only diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index d435f3072..618a57ef7 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -1009,7 +1009,10 @@ subauth (struct passwd *pw) QUOTA_LIMITS quota; char nt_domain[INTERNET_MAX_HOST_NAME_LENGTH + 1]; char nt_user[UNLEN + 1]; - HANDLE user_token = INVALID_HANDLE_VALUE; + /* Changed from INVALID_HANDLE_VALUE to NULL. A failed LsaLogonUser + sets the token to NULL anyway, so starting with NULL simplifies + the below test before calling CloseHandle. */ + HANDLE user_token = NULL; HANDLE primary_token = INVALID_HANDLE_VALUE; push_self_privilege (SE_TCB_PRIV, true); @@ -1076,7 +1079,7 @@ subauth (struct passwd *pw) out: pop_self_privilege (); - if (user_token != INVALID_HANDLE_VALUE) + if (user_token) CloseHandle (user_token); return primary_token; } |