diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | openbsd-compat/readpassphrase.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,7 @@ | |||
1 | 20100113 | 1 | 20100113 |
2 | - (dtucker) [monitor_fdpass.c] Wrap poll.h include in ifdefs. | 2 | - (dtucker) [monitor_fdpass.c] Wrap poll.h include in ifdefs. |
3 | - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18: | ||
4 | missing restore of SIGTTOU and some whitespace. | ||
3 | 5 | ||
4 | 20100112 | 6 | 20100112 |
5 | - (dtucker) OpenBSD CVS Sync | 7 | - (dtucker) OpenBSD CVS Sync |
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index 11bd8f646..16e07e816 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c | |||
@@ -152,6 +152,7 @@ restart: | |||
152 | (void)sigaction(SIGTERM, &saveterm, NULL); | 152 | (void)sigaction(SIGTERM, &saveterm, NULL); |
153 | (void)sigaction(SIGTSTP, &savetstp, NULL); | 153 | (void)sigaction(SIGTSTP, &savetstp, NULL); |
154 | (void)sigaction(SIGTTIN, &savettin, NULL); | 154 | (void)sigaction(SIGTTIN, &savettin, NULL); |
155 | (void)sigaction(SIGTTOU, &savettou, NULL); | ||
155 | if (input != STDIN_FILENO) | 156 | if (input != STDIN_FILENO) |
156 | (void)close(input); | 157 | (void)close(input); |
157 | 158 | ||
@@ -172,7 +173,7 @@ restart: | |||
172 | errno = save_errno; | 173 | errno = save_errno; |
173 | return(nr == -1 ? NULL : buf); | 174 | return(nr == -1 ? NULL : buf); |
174 | } | 175 | } |
175 | 176 | ||
176 | #if 0 | 177 | #if 0 |
177 | char * | 178 | char * |
178 | getpass(const char *prompt) | 179 | getpass(const char *prompt) |