diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | channels.c | 6 | ||||
| -rw-r--r-- | servconf.c | 4 |
3 files changed, 14 insertions, 6 deletions
@@ -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@ @@ -5006,5 +5014,5 @@ 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.5160 2009/01/21 09:29:20 djm Exp $ +$Id: ChangeLog,v 1.5161 2009/01/28 05:13:04 djm Exp $ @@ -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 <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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 */ @@ -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 <ylo@cs.hut.fi>, 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"); } |