summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--openbsd-compat/readpassphrase.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ecf83e4d5..0978c43ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
120050512 120050512
2 - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure
3 terminal modes are reset correctly. Fix from peak AT argo.troja.mff.cuni.cz;
4 "looks ok" dtucker@
5
620050512
2 - (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script 7 - (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script
3 hard link section. Bug 1038. 8 hard link section. Bug 1038.
4 9
@@ -2482,4 +2487,4 @@
2482 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2487 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2483 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2488 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2484 2489
2485$Id: ChangeLog,v 1.3755 2005/05/12 17:32:19 tim Exp $ 2490$Id: ChangeLog,v 1.3756 2005/05/24 05:54:27 djm Exp $
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 4ee1be5de..b5f4d1ce4 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -138,7 +138,9 @@ restart:
138 138
139 /* Restore old terminal settings and signals. */ 139 /* Restore old terminal settings and signals. */
140 if (memcmp(&term, &oterm, sizeof(term)) != 0) 140 if (memcmp(&term, &oterm, sizeof(term)) != 0)
141 (void)tcsetattr(input, _T_FLUSH, &oterm); 141 for (;tcsetattr(input, _T_FLUSH, &oterm) == -1 &&
142 errno == EINTR;)
143 ;
142 (void)sigaction(SIGALRM, &savealrm, NULL); 144 (void)sigaction(SIGALRM, &savealrm, NULL);
143 (void)sigaction(SIGHUP, &savehup, NULL); 145 (void)sigaction(SIGHUP, &savehup, NULL);
144 (void)sigaction(SIGINT, &saveint, NULL); 146 (void)sigaction(SIGINT, &saveint, NULL);