From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 21 Dec 1997 23:17:48 +0000 (+0000)
Subject: Don't set the tty variable to NULL when we lack a tty, leave it as
X-Git-Tag: SUDO_1_5_4~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07e09b16f21526691cc78cc1fb03c50974831d00;p=sudo

Don't set the tty variable to NULL when we lack a tty, leave it as
"unknown".
---

diff --git a/sudo.c b/sudo.c
index 8342ce59f..bfad70a59 100644
--- a/sudo.c
+++ b/sudo.c
@@ -433,10 +433,10 @@ static void load_globals(sudo_mode)
     /*
      * Need to get tty early since it's used for logging
      */
-    if ((tty = (char *) ttyname(0)) || (tty = (char *) ttyname(1))) {
-	if (strncmp(tty, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
-	    tty += sizeof(_PATH_DEV) - 1;
-	if ((tty = (char *) strdup(tty)) == NULL) {
+    if ((p = (char *) ttyname(0)) || (p = (char *) ttyname(1))) {
+	if (strncmp(p, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
+	    p += sizeof(_PATH_DEV) - 1;
+	if ((tty = (char *) strdup(p)) == NULL) {
 	    perror("malloc");
 	    (void) fprintf(stderr, "%s: cannot allocate memory!\n", Argv[0]);
 	    exit(1);