diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.74 2000/11/23 21:03:47 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.75 2000/11/30 07:02:35 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/dsa.h> | 45 | #include <openssl/dsa.h> |
@@ -526,15 +526,15 @@ main(int ac, char **av) | |||
526 | if (buffer_len(&command) == 0) | 526 | if (buffer_len(&command) == 0) |
527 | tty_flag = 1; | 527 | tty_flag = 1; |
528 | 528 | ||
529 | /* Force no tty*/ | ||
530 | if (no_tty_flag) | ||
531 | tty_flag = 0; | ||
529 | /* Do not allocate a tty if stdin is not a tty. */ | 532 | /* Do not allocate a tty if stdin is not a tty. */ |
530 | if (!isatty(fileno(stdin))) { | 533 | if (!isatty(fileno(stdin))) { |
531 | if (tty_flag) | 534 | if (tty_flag) |
532 | fprintf(stderr, "Pseudo-terminal will not be allocated because stdin is not a terminal.\n"); | 535 | fprintf(stderr, "Pseudo-terminal will not be allocated because stdin is not a terminal.\n"); |
533 | tty_flag = 0; | 536 | tty_flag = 0; |
534 | } | 537 | } |
535 | /* force */ | ||
536 | if (no_tty_flag) | ||
537 | tty_flag = 0; | ||
538 | 538 | ||
539 | /* Get user data. */ | 539 | /* Get user data. */ |
540 | pw = getpwuid(original_real_uid); | 540 | pw = getpwuid(original_real_uid); |