mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 14:55:12 +00:00
Code Issues Releases Wiki Activity

get_process_ttyname() now returns a dev_t, not a string.

Browse Source
This commit is contained in:
Todd C. Miller
2024-08-13 19:52:00 -06:00
parent e9e0096a19
commit f3aa3f1f28
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/regress/ttyname/check_ttyname.c
View File

@@ -40,7 +40,7 @@
sudo_dso_public int main(int argc, char *argv[]); sudo_dso_public int main(int argc, char *argv[]);
int sudo_debug_instance = SUDO_DEBUG_INSTANCE_INITIALIZER; int sudo_debug_instance = SUDO_DEBUG_INSTANCE_INITIALIZER;
extern char *get_process_ttyname(char *name, size_t namelen); extern dev_t get_process_ttyname(char *name, size_t namelen);
static int static int
match_ttys(const char *tty1, const char *tty2) match_ttys(const char *tty1, const char *tty2)
@@ -67,9 +67,10 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
char *tty_libc = NULL, *tty_sudo = NULL; char *tty_libc = NULL, *tty_sudo = NULL;
int ch, errors = 0, ntests = 1;
char pathbuf[PATH_MAX]; char pathbuf[PATH_MAX];
bool verbose = false; bool verbose = false;
int ch, errors = 0, ntests = 1; dev_t ttydev;
initprogname(argc > 0 ? argv[0] : "check_ttyname"); initprogname(argc > 0 ? argv[0] : "check_ttyname");
@@ -85,7 +86,8 @@ main(int argc, char *argv[])
} }
/* Lookup tty name using kernel info if possible. */ /* Lookup tty name using kernel info if possible. */
if (get_process_ttyname(pathbuf, sizeof(pathbuf)) != NULL) ttydev = get_process_ttyname(pathbuf, sizeof(pathbuf));
if (ttydev != (dev_t)-1)
tty_sudo = pathbuf; tty_sudo = pathbuf;
#if defined(HAVE_KINFO_PROC2_NETBSD) || \ #if defined(HAVE_KINFO_PROC2_NETBSD) || \