diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | channels.c | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -22,6 +22,10 @@ | |||
22 | USE_AFS not referenced so remove #ifdef. fixes sshd -T not printing | 22 | USE_AFS not referenced so remove #ifdef. fixes sshd -T not printing |
23 | kerberosgetafstoken. ok dtucker@ | 23 | kerberosgetafstoken. ok dtucker@ |
24 | (Id sync only, we still want the ifdef in portable) | 24 | (Id sync only, we still want the ifdef in portable) |
25 | - stevesk@cvs.openbsd.org 2008/11/11 03:55:11 | ||
26 | [channels.c] | ||
27 | for sshd -T print 'permitopen any' vs. 'permitopen' for case of no | ||
28 | permitopen's; ok and input dtucker@ | ||
25 | 29 | ||
26 | 20081105 | 30 | 20081105 |
27 | - OpenBSD CVS Sync | 31 | - OpenBSD CVS Sync |
@@ -4914,4 +4918,4 @@ | |||
4914 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4918 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4915 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4919 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4916 | 4920 | ||
4917 | $Id: ChangeLog,v 1.5138 2008/11/11 05:39:44 dtucker Exp $ | 4921 | $Id: ChangeLog,v 1.5139 2008/11/11 05:40:22 dtucker Exp $ |
diff --git a/channels.c b/channels.c index 4af7df5db..225551e6a 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.287 2008/11/01 06:43:33 stevesk Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.288 2008/11/11 03:55:11 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,6 +2791,10 @@ channel_print_adm_permitted_opens(void) | |||
2791 | { | 2791 | { |
2792 | int i; | 2792 | int i; |
2793 | 2793 | ||
2794 | if (num_adm_permitted_opens == 0) { | ||
2795 | printf(" any"); | ||
2796 | return; | ||
2797 | } | ||
2794 | for (i = 0; i < num_adm_permitted_opens; i++) | 2798 | for (i = 0; i < num_adm_permitted_opens; i++) |
2795 | if (permitted_adm_opens[i].host_to_connect != NULL) | 2799 | if (permitted_adm_opens[i].host_to_connect != NULL) |
2796 | printf(" %s:%d", permitted_adm_opens[i].host_to_connect, | 2800 | printf(" %s:%d", permitted_adm_opens[i].host_to_connect, |