diff options
| author | Jeremy Allison <jra@samba.org> | 2008-05-09 14:51:45 -0700 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-09-14 18:19:59 +0200 |
| commit | d61a86b8cdb4dd474611baadc61a0c37db0f8e62 (patch) | |
| tree | 193588c5647da68b64458ce1444ac952524322e6 | |
| parent | 2e3629719790e7631d9de383b565dc8a0997bcfb (diff) | |
| download | samba-d61a86b8cdb4dd474611baadc61a0c37db0f8e62.tar.gz | |
Fix replacement getpass. If we ^C at the prompt echo was left off.
Jeremy.
(cherry picked from commit e54c71954ae484fe4a4e195db33440490e78e256)
| -rw-r--r-- | source/lib/replace/getpass.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c index 73333b90219..0be618fc916 100644 --- a/source/lib/replace/getpass.c +++ b/source/lib/replace/getpass.c @@ -187,10 +187,6 @@ char *rep_getpass(const char *prompt) in_fd = fileno(in); if (fgets(buf, bufsize, in) == NULL) { buf[0] = 0; - if (in && in != stdin) { - fclose(in); - } - return buf; } } nread = strlen(buf); @@ -201,8 +197,9 @@ char *rep_getpass(const char *prompt) /* Restore echoing. */ if (echo_off) { - if (gotintr && in_fd == -1) + if (gotintr && in_fd == -1) { in = fopen ("/dev/tty", "w+"); + } if (in != NULL) tcsetattr (fileno (in), TCSANOW, &t); } |