- stevesk@cvs.openbsd.org 2008/12/09 03:20:42

     [channels.c servconf.c]
     channel_print_adm_permitted_opens() should deal with all the printing
     for that config option.  suggested by markus@; ok markus@ djm@
     dtucker@

diff --git a/ChangeLog b/ChangeLog
index 25a2f5048fe9c307ac20f11195a2f0a1280e722e..906a234d5c594658430f89f53eb353af8579a9e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20081228
+ - (djm) OpenBSD CVS Sync
+   - stevesk@cvs.openbsd.org 2008/12/09 03:20:42
+     [channels.c servconf.c]
+     channel_print_adm_permitted_opens() should deal with all the printing
+     for that config option.  suggested by markus@; ok markus@ djm@
+     dtucker@
+
 20090107
  - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
    Patch based on one from vgiffin AT apple.com; ok dtucker@

diff --git a/channels.c b/channels.c
index 8fcba783e33408c8d27be674db9b8803ebc98805..c0d335921c56d3642702b8863edc38513fc7cbac 100644 (file)
--- a/channels.c
+++ b/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
@@ -2791,14 +2791,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/servconf.c b/servconf.c
index 659a1eb21b319853ca2bda615c7de65cccd0f56e..7d8851860261eca82277318ffafe1a00b0ccc695 100644 (file)
--- a/servconf.c
+++ b/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
@@ -1655,7 +1655,5 @@ dump_config(ServerOptions *o)
                }
        dump_cfg_string(sPermitTunnel, s);
 
-       printf("permitopen");
        channel_print_adm_permitted_opens();
-       printf("\n");
 }