oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

roken: Move an #endif in issuid() to avoid dead code

Browse Source
This commit is contained in:
Nicolas Williams
2022-12-30 19:16:51 -06:00
parent 319793b30b
commit aee72d61bf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/roken/issuid.c
View File

@@ -171,7 +171,7 @@ issuid(void)
if (issetugid() == 0) if (issetugid() == 0)
return we_are_suid = 0; return we_are_suid = 0;
/* issetugid() == 1 might have been a false positive; fall through */ /* issetugid() == 1 might have been a false positive; fall through */
#endif /* USE_RK_GETAUXVAL */ #endif
#ifdef AT_EXECFN #ifdef AT_EXECFN
/* /*
@@ -186,6 +186,9 @@ issuid(void)
* Also, this is technically a TOCTOU race, though for set-id * Also, this is technically a TOCTOU race, though for set-id
* programs this is exceedingly unlikely to be an actual TOCTOU * programs this is exceedingly unlikely to be an actual TOCTOU
* race. * race.
*
* TODO We should really make sure that none of the path components of the
* execpath are symlinks.
*/ */
{ {
unsigned long p = rk_getauxval(AT_EXECPATH); unsigned long p = rk_getauxval(AT_EXECPATH);
@@ -267,10 +270,9 @@ issuid(void)
return we_are_suid = 1; return we_are_suid = 1;
#endif #endif
#endif /* !defined(HAVE_GETRESUID) || !defined(HAVE_GETRESGID) */
errno = save_errno; errno = save_errno;
return we_are_suid = 0; return we_are_suid = 0;
#endif /* !defined(HAVE_GETRESUID) || !defined(HAVE_GETRESGID) */
#endif /* !defined(HAVE_ISSETUGID) */ #endif /* !defined(HAVE_ISSETUGID) */
#endif /* WIN32 */ #endif /* WIN32 */
} }