diff --git a/ChangeLog b/ChangeLog
index 60a89df46..7e5a776fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20010814
  - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
    for some #ifdef _CRAY code; ok wendyp@cray.com
+ - (stevesk) sshpty.c: return 0 on error in cray pty code;
+   ok wendyp@cray.com
 
 20010812
  - (djm) Fix detection of long long int support. Based on patch from 
@@ -6282,4 +6284,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1471 2001/08/14 20:35:35 stevesk Exp $
+$Id: ChangeLog,v 1.1472 2001/08/14 20:41:34 stevesk Exp $
diff --git a/sshpty.c b/sshpty.c
index 31abd696c..f88658b80 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -186,6 +186,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 		if (*ttyfd < 0) {
 			error("%.100s: %.100s", namebuf, strerror(errno));
 			close(*ptyfd);
+			return 0;
 		}
 		return 1;
 	}