diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-02-07 04:15:22 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-02-07 04:15:22 +0000 |
| commit | e8ee901a519d2f5eaf73b3b83dbac41c88d3d34c (patch) | |
| tree | a71df2172ffb688ee532265b584f081d870b5c79 /src/lib/krb5/os | |
| parent | 1b3855f2ede597123d36a4941328583918053f8f (diff) | |
| download | krb5-e8ee901a519d2f5eaf73b3b83dbac41c88d3d34c.tar.gz krb5-e8ee901a519d2f5eaf73b3b83dbac41c88d3d34c.tar.xz krb5-e8ee901a519d2f5eaf73b3b83dbac41c88d3d34c.zip | |
* prompter.c (krb5_prompter_posix, setup_tty, restore_tty): Fix to
use the actual file descriptor we dup()'ed to in case tcsetattr()
doesn't actually change the underlying device modes and instead
only affects the specific file descriptor.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15164 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/os')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/krb5/os/prompter.c | 27 |
2 files changed, 22 insertions, 12 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 3ad433b124..53c7a38816 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,10 @@ +2003-02-06 Tom Yu <tlyu@mit.edu> + + * prompter.c (krb5_prompter_posix, setup_tty, restore_tty): Fix to + use the actual file descriptor we dup()'ed to in case tcsetattr() + doesn't actually change the underlying device modes and instead + only affects the specific file descriptor. + 2003-02-06 Ken Raeburn <raeburn@mit.edu> * locate_kdc.c (translate_ai_error): Handle EAI_ADDRFAMILY like diff --git a/src/lib/krb5/os/prompter.c b/src/lib/krb5/os/prompter.c index 3e4503216d..81e0b78f0e 100644 --- a/src/lib/krb5/os/prompter.c +++ b/src/lib/krb5/os/prompter.c @@ -15,8 +15,8 @@ static void catch_signals(void); static void restore_signals(void); static krb5_sigtype intrfunc(int sig); -static krb5_error_code setup_tty(int); -static krb5_error_code restore_tty(void); +static krb5_error_code setup_tty(FILE*, int); +static krb5_error_code restore_tty(FILE*); #ifdef POSIX_SIGNALS static struct sigaction osigint; @@ -75,7 +75,7 @@ krb5_prompter_posix( (void)fflush(stdout); (void)memset(prompts[i].reply->data, 0, prompts[i].reply->length); - errcode = setup_tty(prompts[i].hidden); + errcode = setup_tty(fp, prompts[i].hidden); if (errcode) { if (prompts[i].hidden) putchar('\n'); @@ -91,7 +91,7 @@ krb5_prompter_posix( errcode = KRB5_LIBOS_PWDINTR; else errcode = KRB5_LIBOS_CANTREADPWD; - restore_tty(); + restore_tty(fp); break; } @@ -106,7 +106,7 @@ krb5_prompter_posix( } while (scratchchar != EOF && scratchchar != '\n'); } - errcode = restore_tty(); + errcode = restore_tty(fp); if (errcode) break; prompts[i].reply->length = strlen(prompts[i].reply->data); @@ -153,19 +153,21 @@ restore_signals(void) static struct termios saveparm; static krb5_error_code -setup_tty(int hidden) +setup_tty(FILE *fp, int hidden) { krb5_error_code ret; + int fd; struct termios tparm; ret = KRB5_LIBOS_CANTREADPWD; catch_signals(); + fd = fileno(fp); do { - if (!isatty(STDIN_FILENO)) { + if (!isatty(fd)) { ret = 0; break; } - if (tcgetattr(STDIN_FILENO, &tparm) < 0) + if (tcgetattr(fd, &tparm) < 0) break; saveparm = tparm; #ifndef ECHO_PASSWORD @@ -184,13 +186,14 @@ setup_tty(int hidden) } static krb5_error_code -restore_tty(void) +restore_tty(FILE* fp) { - int ret; + int ret, fd; ret = 0; - if (isatty(STDIN_FILENO)) { - ret = tcsetattr(STDIN_FILENO, TCSANOW, &saveparm); + fd = fileno(fp); + if (isatty(fd)) { + ret = tcsetattr(fd, TCSANOW, &saveparm); if (ret < 0) ret = KRB5_LIBOS_CANTREADPWD; else |