merged OPENSSH_4_2P1_GSSAPI_20051220 to GPT branch

[gssapi-openssh.git] / openssh / openbsd-compat / readpassphrase.c

diff --git a/openssh/openbsd-compat/readpassphrase.c b/openssh/openbsd-compat/readpassphrase.c
index 4ee1be5de283d00796c7484cd3b1858ec7e7bbba..eb060bdbfbc05675ee988f7017967a974a63c4bd 100644 (file)
--- a/openssh/openbsd-compat/readpassphrase.c
+++ b/openssh/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);