Merge 4.1p1 to the trunk.

1 files changed, 5 insertions, 2 deletions

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 4ee1be5de..eb060bdbf 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -137,8 +137,11 @@ restart:
                 (void)write(output, "\n", 1);
 
         /* Restore old terminal settings and signals. */
-        if (memcmp(&term, &oterm, sizeof(term)) != 0)
-                (void)tcsetattr(input, _T_FLUSH, &oterm);
+        if (memcmp(&term, &oterm, sizeof(term)) != 0) {
+                while (tcsetattr(input, _T_FLUSH, &oterm) == -1 &&
+                    errno == EINTR)
+                        continue;
+        }
         (void)sigaction(SIGALRM, &savealrm, NULL);
         (void)sigaction(SIGHUP, &savehup, NULL);
         (void)sigaction(SIGINT, &saveint, NULL);