From: dtucker <dtucker>
Date: Wed, 13 Jan 2010 07:27:32 +0000 (+0000)
Subject:  - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18:  ... 
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/1f4dfa1815e0c2ac9e3cee45793dda64f2da1c06

 - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18:    missing restore of SIGTTOU and some whitespace.
---

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)