From 6840567112c07d7b6b89f5c334bc7bbaec0c809d Mon Sep 17 00:00:00 2001 From: djm Date: Wed, 28 Jan 2009 05:13:04 +0000 Subject: [PATCH] - stevesk@cvs.openbsd.org 2008/12/09 03:20:42 [channels.c servconf.c] channel_print_adm_permitted_opens() should deal with all the printing for that config option. suggested by markus@; ok markus@ djm@ dtucker@ --- ChangeLog | 8 ++++++++ channels.c | 6 ++++-- servconf.c | 4 +--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25a2f504..906a234d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +20081228 + - (djm) OpenBSD CVS Sync + - stevesk@cvs.openbsd.org 2008/12/09 03:20:42 + [channels.c servconf.c] + channel_print_adm_permitted_opens() should deal with all the printing + for that config option. suggested by markus@; ok markus@ djm@ + dtucker@ + 20090107 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. Patch based on one from vgiffin AT apple.com; ok dtucker@ diff --git a/channels.c b/channels.c index 8fcba783..c0d33592 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.289 2008/12/02 19:09:38 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.290 2008/12/09 03:20:42 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -2791,14 +2791,16 @@ channel_print_adm_permitted_opens(void) { int i; + printf("permitopen"); if (num_adm_permitted_opens == 0) { - printf(" any"); + printf(" any\n"); return; } for (i = 0; i < num_adm_permitted_opens; i++) if (permitted_adm_opens[i].host_to_connect != NULL) printf(" %s:%d", permitted_adm_opens[i].host_to_connect, permitted_adm_opens[i].port_to_connect); + printf("\n"); } /* Try to start non-blocking connect to next host in cctx list */ diff --git a/servconf.c b/servconf.c index 659a1eb2..7d885186 100644 --- a/servconf.c +++ b/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.192 2008/11/11 02:58:09 stevesk Exp $ */ +/* $OpenBSD: servconf.c,v 1.193 2008/12/09 03:20:42 stevesk Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -1655,7 +1655,5 @@ dump_config(ServerOptions *o) } dump_cfg_string(sPermitTunnel, s); - printf("permitopen"); channel_print_adm_permitted_opens(); - printf("\n"); } -- 2.45.2