merge 6.2p1; reorder additions to monitor.h for easier merging in future

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 @@
-/* $OpenBSD: channels.c,v 1.318 2012/04/23 08:18:17 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.319 2012/12/02 20:46:11 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3165,12 +3165,10 @@ channel_add_adm_permitted_opens(char *host, int port)
 void
 channel_disable_adm_local_opens(void)
 {
-        if (num_adm_permitted_opens == 0) {
-                permitted_adm_opens = xmalloc(sizeof(*permitted_adm_opens));
-                permitted_adm_opens[num_adm_permitted_opens].host_to_connect
-                   = NULL;
-                num_adm_permitted_opens = 1;
-        }
+        channel_clear_adm_permitted_opens();
+        permitted_adm_opens = xmalloc(sizeof(*permitted_adm_opens));
+        permitted_adm_opens[num_adm_permitted_opens].host_to_connect = NULL;
+        num_adm_permitted_opens = 1;
 }
 
 void