diff options
author | Damien Miller <djm@mindrot.org> | 2009-01-28 16:13:04 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-01-28 16:13:04 +1100 |
commit | b53d8a18823cfa689b6a2353c6f82aaf364047bf (patch) | |
tree | 1be3d1f202de91bc60af53f17778374f8a23a536 | |
parent | 0266677f0feb72b092f87480a4c8695c71db9684 (diff) |
- 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@
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | channels.c | 6 | ||||
-rw-r--r-- | servconf.c | 4 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ | |||
1 | 20081228 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - stevesk@cvs.openbsd.org 2008/12/09 03:20:42 | ||
4 | [channels.c servconf.c] | ||
5 | channel_print_adm_permitted_opens() should deal with all the printing | ||
6 | for that config option. suggested by markus@; ok markus@ djm@ | ||
7 | dtucker@ | ||
8 | |||
1 | 20090107 | 9 | 20090107 |
2 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. | 10 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. |
3 | Patch based on one from vgiffin AT apple.com; ok dtucker@ | 11 | Patch based on one from vgiffin AT apple.com; ok dtucker@ |
@@ -5006,5 +5014,5 @@ | |||
5006 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5014 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5007 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5015 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5008 | 5016 | ||
5009 | $Id: ChangeLog,v 1.5160 2009/01/21 09:29:20 djm Exp $ | 5017 | $Id: ChangeLog,v 1.5161 2009/01/28 05:13:04 djm Exp $ |
5010 | 5018 | ||
diff --git a/channels.c b/channels.c index 8fcba783e..c0d335921 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.289 2008/12/02 19:09:38 markus Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.290 2008/12/09 03:20:42 stevesk 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 |
@@ -2791,14 +2791,16 @@ channel_print_adm_permitted_opens(void) | |||
2791 | { | 2791 | { |
2792 | int i; | 2792 | int i; |
2793 | 2793 | ||
2794 | printf("permitopen"); | ||
2794 | if (num_adm_permitted_opens == 0) { | 2795 | if (num_adm_permitted_opens == 0) { |
2795 | printf(" any"); | 2796 | printf(" any\n"); |
2796 | return; | 2797 | return; |
2797 | } | 2798 | } |
2798 | for (i = 0; i < num_adm_permitted_opens; i++) | 2799 | for (i = 0; i < num_adm_permitted_opens; i++) |
2799 | if (permitted_adm_opens[i].host_to_connect != NULL) | 2800 | if (permitted_adm_opens[i].host_to_connect != NULL) |
2800 | printf(" %s:%d", permitted_adm_opens[i].host_to_connect, | 2801 | printf(" %s:%d", permitted_adm_opens[i].host_to_connect, |
2801 | permitted_adm_opens[i].port_to_connect); | 2802 | permitted_adm_opens[i].port_to_connect); |
2803 | printf("\n"); | ||
2802 | } | 2804 | } |
2803 | 2805 | ||
2804 | /* Try to start non-blocking connect to next host in cctx list */ | 2806 | /* Try to start non-blocking connect to next host in cctx list */ |
diff --git a/servconf.c b/servconf.c index 659a1eb21..7d8851860 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.192 2008/11/11 02:58:09 stevesk Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.193 2008/12/09 03:20:42 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1655,7 +1655,5 @@ dump_config(ServerOptions *o) | |||
1655 | } | 1655 | } |
1656 | dump_cfg_string(sPermitTunnel, s); | 1656 | dump_cfg_string(sPermitTunnel, s); |
1657 | 1657 | ||
1658 | printf("permitopen"); | ||
1659 | channel_print_adm_permitted_opens(); | 1658 | channel_print_adm_permitted_opens(); |
1660 | printf("\n"); | ||
1661 | } | 1659 | } |