diff options
author | Damien Miller <djm@mindrot.org> | 2012-04-22 11:18:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-04-22 11:18:53 +1000 |
commit | c6081482b2b72caccce938c100c1b55f7b5e30fe (patch) | |
tree | 8bdb5d2df8d77e980822911573ffea17f4c67238 /channels.c | |
parent | 48348fc3b4455df8112d4e1b6de5b4f0779be875 (diff) |
- dtucker@cvs.openbsd.org 2012/03/29 23:54:36
[channels.c channels.h servconf.c]
Add PermitOpen none option based on patch from Loganaden Velvindron
(bz #1949). ok djm@
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/channels.c b/channels.c index f6e9b4d8c..e5783b197 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.315 2011/09/23 07:45:05 markus Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.316 2012/03/29 23:54:36 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 |
@@ -3127,6 +3127,17 @@ channel_add_adm_permitted_opens(char *host, int port) | |||
3127 | } | 3127 | } |
3128 | 3128 | ||
3129 | void | 3129 | void |
3130 | channel_disable_adm_local_opens(void) | ||
3131 | { | ||
3132 | if (num_adm_permitted_opens == 0) { | ||
3133 | permitted_adm_opens = xmalloc(sizeof(*permitted_adm_opens)); | ||
3134 | permitted_adm_opens[num_adm_permitted_opens].host_to_connect | ||
3135 | = NULL; | ||
3136 | num_adm_permitted_opens = 1; | ||
3137 | } | ||
3138 | } | ||
3139 | |||
3140 | void | ||
3130 | channel_clear_permitted_opens(void) | 3141 | channel_clear_permitted_opens(void) |
3131 | { | 3142 | { |
3132 | int i; | 3143 | int i; |
@@ -3167,7 +3178,9 @@ channel_print_adm_permitted_opens(void) | |||
3167 | return; | 3178 | return; |
3168 | } | 3179 | } |
3169 | for (i = 0; i < num_adm_permitted_opens; i++) | 3180 | for (i = 0; i < num_adm_permitted_opens; i++) |
3170 | if (permitted_adm_opens[i].host_to_connect != NULL) | 3181 | if (permitted_adm_opens[i].host_to_connect == NULL) |
3182 | printf(" none"); | ||
3183 | else | ||
3171 | printf(" %s:%d", permitted_adm_opens[i].host_to_connect, | 3184 | printf(" %s:%d", permitted_adm_opens[i].host_to_connect, |
3172 | permitted_adm_opens[i].port_to_connect); | 3185 | permitted_adm_opens[i].port_to_connect); |
3173 | printf("\n"); | 3186 | printf("\n"); |