diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2019-01-25 19:58:21 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-01-26 12:42:38 +0100 |
| commit | 0e3fd33321414e03466370bca048b4c4b6f91ba0 (patch) | |
| tree | 730163e46bd15d05d535ce1ff01c58afc3f14976 | |
| parent | 3a1ed0ef7060bb9ebf18ac3c00a5cb2860b225d1 (diff) | |
| download | cygnal-0e3fd33321414e03466370bca048b4c4b6f91ba0.tar.gz cygnal-0e3fd33321414e03466370bca048b4c4b6f91ba0.tar.bz2 cygnal-0e3fd33321414e03466370bca048b4c4b6f91ba0.zip | |
Cygwin: create_token: Return NULL, not INVALID_HANDLE_VALUE
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/sec_auth.cc | 5 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc index 1d07e374f..54053dfb5 100644 --- a/winsup/cygwin/sec_auth.cc +++ b/winsup/cygwin/sec_auth.cc @@ -907,8 +907,8 @@ create_token (cygsid &usersid, user_groups &new_groups) source.SourceIdentifier.HighPart = 0; source.SourceIdentifier.LowPart = 0x0101; - HANDLE token = INVALID_HANDLE_VALUE; - HANDLE primary_token = INVALID_HANDLE_VALUE; + HANDLE token = NULL; + HANDLE primary_token = NULL; tmp_pathbuf tp; PTOKEN_GROUPS my_tok_gsids = NULL; @@ -1010,6 +1010,7 @@ create_token (cygsid &usersid, user_groups &new_groups) { __seterrno (); debug_printf ("DuplicateTokenEx %E"); + primary_token = NULL; } } diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 289f4626f..978bd424e 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -3546,10 +3546,9 @@ seteuid32 (uid_t uid) if (!(new_token = lsaauth (usersid, groups))) { debug_printf ("lsaauth failed, try create_token."); - new_token = create_token (usersid, groups); - if (new_token == INVALID_HANDLE_VALUE) + if (!(new_token = create_token (usersid, groups))) { - debug_printf ("create_token failed, bail out of here"); + debug_printf ("create_token failed, bail out"); cygheap->user.reimpersonate (); return -1; } |