summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-10-26 14:24:30 +1000
committerDamien Miller <djm@mindrot.org>2007-10-26 14:24:30 +1000
commit32a9dba66d64bee67ddf3894a4677fcb1b87f66a (patch)
tree7459ccf94f74d55d0701dfbf2625bdaf193989e1
parentbc1bd9dbe33642bca860919dcfd95e0362d7aba4 (diff)
downloadopenssh-git-32a9dba66d64bee67ddf3894a4677fcb1b87f66a.tar.gz
- stevesk@cvs.openbsd.org 2007/09/11 23:49:09
[sshpty.c] remove #if defined block not needed; ok markus@ dtucker@ (NB. RCD ID sync only for portable)
-rw-r--r--ChangeLog8
-rw-r--r--sshpty.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d568a57a..09c56eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20071026
+ - (djm) OpenBSD CVS Sync
+ - stevesk@cvs.openbsd.org 2007/09/11 23:49:09
+ [sshpty.c]
+ remove #if defined block not needed; ok markus@ dtucker@
+ (NB. RCD ID sync only for portable)
20070927
- (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if
we don't have <poll.h> (eq QNX). From bacon at cs nyu edu.
@@ -3268,4 +3274,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4760 2007/09/26 21:03:20 dtucker Exp $
+$Id: ChangeLog,v 1.4761 2007/10/26 04:24:30 djm Exp $
diff --git a/sshpty.c b/sshpty.c
index 34ea7a74..5a0d1a7a 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshpty.c,v 1.27 2007/09/11 04:36:29 stevesk Exp $ */
+/* $OpenBSD: sshpty.c,v 1.28 2007/09/11 23:49:09 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland