diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-10 23:01:51 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-10 23:01:51 +1000 |
commit | e7140f20cb2da1456e6080059eef54cf0f3533f2 (patch) | |
tree | 7c4809d2dbb4b9e93599a2fb29c51a4621f88346 /channels.c | |
parent | b06cc4abf8e2eb4d1e14f19911a7e0afde50ee95 (diff) |
- dtucker@cvs.openbsd.org 2008/06/10 04:50:25
[sshd.c channels.h channels.c log.c servconf.c log.h servconf.h sshd.8]
Add extended test mode (-T) and connection parameters for test mode (-C).
-T causes sshd to write its effective configuration to stdout and exit.
-C causes any relevant Match rules to be applied before output. The
combination allows tesing of the parser and config files. ok deraadt djm
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/channels.c b/channels.c index 99b23d75f..6808d3a05 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.277 2008/05/09 16:17:51 markus Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.278 2008/06/10 04:50:25 dtucker 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 |
@@ -2784,6 +2784,17 @@ channel_clear_adm_permitted_opens(void) | |||
2784 | num_adm_permitted_opens = 0; | 2784 | num_adm_permitted_opens = 0; |
2785 | } | 2785 | } |
2786 | 2786 | ||
2787 | void | ||
2788 | channel_print_adm_permitted_opens(void) | ||
2789 | { | ||
2790 | static int i; | ||
2791 | |||
2792 | for (i = 0; i < num_adm_permitted_opens; i++) | ||
2793 | if (permitted_adm_opens[i].host_to_connect != NULL) | ||
2794 | printf(" %s:%d", permitted_adm_opens[i].host_to_connect, | ||
2795 | permitted_adm_opens[i].port_to_connect); | ||
2796 | } | ||
2797 | |||
2787 | /* Try to start non-blocking connect to next host in cctx list */ | 2798 | /* Try to start non-blocking connect to next host in cctx list */ |
2788 | static int | 2799 | static int |
2789 | connect_next(struct channel_connect *cctx) | 2800 | connect_next(struct channel_connect *cctx) |