summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-07 10:06:42 +0100
committerColin Watson <cjwatson@debian.org>2013-05-07 10:06:42 +0100
commitecebda56da46a03dafff923d91c382f31faa9eec (patch)
tree449614b6c06a2622c74a609b31fcc46c60037c56 /channels.c
parentc6a2c0334e45419875687d250aed9bea78480f2e (diff)
parentffc06452028ba78cd693d4ed43df8b60a10d6163 (diff)
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/channels.c b/channels.c
index 7791febd7..9cf85a38d 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.318 2012/04/23 08:18:17 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.319 2012/12/02 20:46:11 djm 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
@@ -3165,12 +3165,10 @@ channel_add_adm_permitted_opens(char *host, int port)
3165void 3165void
3166channel_disable_adm_local_opens(void) 3166channel_disable_adm_local_opens(void)
3167{ 3167{
3168 if (num_adm_permitted_opens == 0) { 3168 channel_clear_adm_permitted_opens();
3169 permitted_adm_opens = xmalloc(sizeof(*permitted_adm_opens)); 3169 permitted_adm_opens = xmalloc(sizeof(*permitted_adm_opens));
3170 permitted_adm_opens[num_adm_permitted_opens].host_to_connect 3170 permitted_adm_opens[num_adm_permitted_opens].host_to_connect = NULL;
3171 = NULL; 3171 num_adm_permitted_opens = 1;
3172 num_adm_permitted_opens = 1;
3173 }
3174} 3172}
3175 3173
3176void 3174void