summaryrefslogtreecommitdiff
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 9bd45a121..87c236e66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
120100113 120100113
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
420100112 620100112
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
177char * 178char *
178getpass(const char *prompt) 179getpass(const char *prompt)