mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

On AIX, psinfo.pr_ttydev is 0 when a process has no terminal.

Browse Source 
On most other systems, psinfo.pr_ttydev is -1 for processes
with no associated terminal.  GitHub issue #408
This commit is contained in:
Todd C. Miller 2024-09-11 16:27:51 -06:00
parent ce36f01def
commit d001abc8ee
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ttyname.c
View File

@ -1,7 +1,7 @@
/* /*
* SPDX-License-Identifier: ISC * SPDX-License-Identifier: ISC
* *
* Copyright (c) 2012-2023 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2012-2024 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -23,7 +23,7 @@
#include <config.h> #include <config.h>
/* Large files not supported by procfs.h on Solaris. */ /* Large files may not be supported by procfs.h on Solaris. */
#if defined(HAVE_STRUCT_PSINFO_PR_TTYDEV) #if defined(HAVE_STRUCT_PSINFO_PR_TTYDEV)
# undef _FILE_OFFSET_BITS # undef _FILE_OFFSET_BITS
# undef _LARGE_FILES # undef _LARGE_FILES
@ -175,7 +175,8 @@ get_process_ttyname(char *name, size_t namelen)
if ((psinfo.pr_ttydev & DEVNO64) && sizeof(dev_t) == 4) if ((psinfo.pr_ttydev & DEVNO64) && sizeof(dev_t) == 4)
ttydev = makedev(major64(psinfo.pr_ttydev), minor64(psinfo.pr_ttydev)); ttydev = makedev(major64(psinfo.pr_ttydev), minor64(psinfo.pr_ttydev));
#endif #endif
if (ttydev != (dev_t)-1) { /* On AIX, pr_ttydev is 0 (not -1) when no terminal is present. */
if (ttydev != 0 && ttydev != (dev_t)-1) {
errno = serrno; errno = serrno;
if (sudo_ttyname_dev(ttydev, name, namelen) == NULL) { if (sudo_ttyname_dev(ttydev, name, namelen) == NULL) {
sudo_warnx( sudo_warnx(
@ -185,6 +186,7 @@ get_process_ttyname(char *name, size_t namelen)
} }
goto done; goto done;
} }
ttydev = (dev_t)-1;
} }
} else { } else {
struct stat sb; struct stat sb;