- (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18: ...

diff --git a/ChangeLog b/ChangeLog
index 9bd45a121f4e1bbecd7b42a0ea4204534071a4eb..87c236e669a1d37d8f4f31b8e0085b073ca7db65 100644 (file)
--- 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 11bd8f646e1dbeae558d78ff06b287a80e07e8df..16e07e8166ce9ee50a3b32804c5a48f95b11bc9e 100644 (file)
--- 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)