o Merge changes from OPENSSH_3_5P1_GSI_20021018.

[gssapi-openssh.git] / openssh / sshpty.c

diff --git a/openssh/sshpty.c b/openssh/sshpty.c
index 64ac4e5994fa8d636431b88d043c561217c9030f..28d0e310c4732a050ffdb80b252e75bd11fd24f7 100644 (file)
--- a/openssh/sshpty.c
+++ b/openssh/sshpty.c
@@ -162,7 +162,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
        }
        return 1;
 #else /* HAVE_DEV_PTS_AND_PTC */
-#ifdef _CRAY
+#ifdef _UNICOS
        char buf[64];
        int i;
        int highpty;
@@ -268,7 +268,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
        void *old;
 #endif /* USE_VHANGUP */
 
-#ifdef _CRAY
+#ifdef _UNICOS
        if (setsid() < 0)
                error("setsid: %.100s", strerror(errno));
 
@@ -290,7 +290,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
                error("%.100s: %.100s", ttyname, strerror(errno));
        close(*ttyfd);
        *ttyfd = fd;
-#else /* _CRAY */
+#else /* _UNICOS */
 
        /* First disconnect from the old controlling tty. */
 #ifdef TIOCNOTTY
@@ -345,7 +345,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
                    strerror(errno));
        else 
                close(fd);
-#endif /* _CRAY */
+#endif /* _UNICOS */
 }
 
 /* Changes the window size associated with the pty. */