diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2008-12-09 03:20:43 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2008-12-09 03:20:43 +0000 |
| commit | ac1f2818c19c256715382e9b87246705bbf7b950 (patch) | |
| tree | 28c8c6c90568db027882c6d6299037652479477f | |
| parent | e7c2307b4274de1648f420c4fa841c1da9d5ace4 (diff) | |
channel_print_adm_permitted_opens() should deal with all the printing
for that config option. suggested by markus@; ok markus@ djm@
dtucker@
| -rw-r--r-- | usr.bin/ssh/channels.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 8ccef31de9a..b1efc9f9d0a 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/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 <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2763,14 +2763,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/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 299aae46685..8eba4abc0f0 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/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 <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1607,7 +1607,5 @@ dump_config(ServerOptions *o) } dump_cfg_string(sPermitTunnel, s); - printf("permitopen"); channel_print_adm_permitted_opens(); - printf("\n"); } |