summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-19 11:54:54 +1000
committerDamien Miller <djm@mindrot.org>2002-09-19 11:54:54 +1000
commit9b037b837aea146ab331edea68f39eb377cee3e5 (patch)
tree6e440f04a257944bfe24971fa485aa2956367380
parent86247e2798f9e8f555f93f0c2c1872a4c13c43f6 (diff)
- itojun@cvs.openbsd.org 2002/09/17 07:47:02
[channels.c] don't quit while creating X11 listening socket. http://mail-index.netbsd.org/current-users/2002/09/16/0005.html got from portable. markus ok
-rw-r--r--ChangeLog7
-rw-r--r--channels.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fbdeaaa4..64b36b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@
- stevesk@cvs.openbsd.org 2002/09/16 22:03:13
[sshd.8]
reference moduli(5) in FILES /etc/moduli.
+ - itojun@cvs.openbsd.org 2002/09/17 07:47:02
+ [channels.c]
+ don't quit while creating X11 listening socket.
+ http://mail-index.netbsd.org/current-users/2002/09/16/0005.html
+ got from portable. markus ok
20020912
- (djm) Made GNOME askpass programs return non-zero if cancel button is
@@ -669,4 +674,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2469 2002/09/19 01:51:53 djm Exp $
+$Id: ChangeLog,v 1.2470 2002/09/19 01:54:54 djm Exp $
diff --git a/channels.c b/channels.c
index cf1a6462..6ff9e258 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.182 2002/09/13 19:23:09 stevesk Exp $");
+RCSID("$OpenBSD: channels.c,v 1.183 2002/09/17 07:47:02 itojun Exp $");
#include "ssh.h"
#include "ssh1.h"