summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-13 18:27:32 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-13 18:27:32 +1100
commitab3c2cab18a6c5ae9dd93cacb1a179e48d245228 (patch)
tree40c74616c08082703dbc71a8b3e95ad383399b47
parenta8f20cff82ec514df8aa60bc5248dcad6f90066c (diff)
- (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18: missing restore of SIGTTOU and some whitespace.
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/readpassphrase.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bd45a12..87c236e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
20100113
- (dtucker) [monitor_fdpass.c] Wrap poll.h include in ifdefs.
+ - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18:
+ missing restore of SIGTTOU and some whitespace.
20100112
- (dtucker) OpenBSD CVS Sync
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 11bd8f64..16e07e81 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -152,6 +152,7 @@ restart:
(void)sigaction(SIGTERM, &saveterm, NULL);
(void)sigaction(SIGTSTP, &savetstp, NULL);
(void)sigaction(SIGTTIN, &savettin, NULL);
+ (void)sigaction(SIGTTOU, &savettou, NULL);
if (input != STDIN_FILENO)
(void)close(input);
@@ -172,7 +173,7 @@ restart:
errno = save_errno;
return(nr == -1 ? NULL : buf);
}
-
+
#if 0
char *
getpass(const char *prompt)