summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 01217406f..13addb89d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
8 [clientloop.c] 8 [clientloop.c]
9 rename variable first_gc -> last_gc (since it is actually the last 9 rename variable first_gc -> last_gc (since it is actually the last
10 in the list). 10 in the list).
11 - djm@cvs.openbsd.org 2008/07/16 11:52:19
12 [channels.c]
13 this loop index should be automatic, not static
11 14
1220080714 1520080714
13 - (djm) OpenBSD CVS Sync 16 - (djm) OpenBSD CVS Sync
@@ -4681,4 +4684,4 @@
4681 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4684 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4682 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4685 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4683 4686
4684$Id: ChangeLog,v 1.5086 2008/07/16 12:40:52 djm Exp $ 4687$Id: ChangeLog,v 1.5087 2008/07/16 12:42:06 djm Exp $
diff --git a/channels.c b/channels.c
index 0156e9cb8..69c99c9b2 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.285 2008/07/13 22:13:07 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.286 2008/07/16 11:52:19 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2789,7 +2789,7 @@ channel_clear_adm_permitted_opens(void)
2789void 2789void
2790channel_print_adm_permitted_opens(void) 2790channel_print_adm_permitted_opens(void)
2791{ 2791{
2792 static int i; 2792 int i;
2793 2793
2794 for (i = 0; i < num_adm_permitted_opens; i++) 2794 for (i = 0; i < num_adm_permitted_opens; i++)
2795 if (permitted_adm_opens[i].host_to_connect != NULL) 2795 if (permitted_adm_opens[i].host_to_connect != NULL)