summaryrefslogtreecommitdiff
path: root/sshpty.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-22 23:34:25 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-22 23:34:25 +0000
commit232ccf775459210ee79873d4411328bff6b8d66a (patch)
tree1b216507a0fa6b76c8c0ca9be21da3385e01897d /sshpty.c
parent066e1ab8a36123a910e4dc7b3e2eb15890234a60 (diff)
downloadopenssh-git-232ccf775459210ee79873d4411328bff6b8d66a.tar.gz
- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com.
Diffstat (limited to 'sshpty.c')
-rw-r--r--sshpty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshpty.c b/sshpty.c
index 64ac4e59..e3027ca2 100644
--- a/sshpty.c
+++ b/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
+#if defined(_CRAY) && !defined(_CRAYSV2)
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
+#if defined(_CRAY) && !defined(_CRAYSV2)
if (setsid() < 0)
error("setsid: %.100s", strerror(errno));