summaryrefslogtreecommitdiff
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 fbdeaaa49..64b36b57c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@
19 - stevesk@cvs.openbsd.org 2002/09/16 22:03:13 19 - stevesk@cvs.openbsd.org 2002/09/16 22:03:13
20 [sshd.8] 20 [sshd.8]
21 reference moduli(5) in FILES /etc/moduli. 21 reference moduli(5) in FILES /etc/moduli.
22 - itojun@cvs.openbsd.org 2002/09/17 07:47:02
23 [channels.c]
24 don't quit while creating X11 listening socket.
25 http://mail-index.netbsd.org/current-users/2002/09/16/0005.html
26 got from portable. markus ok
22 27
2320020912 2820020912
24 - (djm) Made GNOME askpass programs return non-zero if cancel button is 29 - (djm) Made GNOME askpass programs return non-zero if cancel button is
@@ -669,4 +674,4 @@
669 save auth method before monitor_reset_key_state(); bugzilla bug #284; 674 save auth method before monitor_reset_key_state(); bugzilla bug #284;
670 ok provos@ 675 ok provos@
671 676
672$Id: ChangeLog,v 1.2469 2002/09/19 01:51:53 djm Exp $ 677$Id: ChangeLog,v 1.2470 2002/09/19 01:54:54 djm Exp $
diff --git a/channels.c b/channels.c
index cf1a6462b..6ff9e2583 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.182 2002/09/13 19:23:09 stevesk Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.183 2002/09/17 07:47:02 itojun Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"