diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-07-19 11:38:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-07-22 13:36:40 +1000 |
commit | d7eabc86fa049a12ba2c3fb198bd1d51b37f7025 (patch) | |
tree | 8ebcc4c4e40c9d4d193e6e109287aea71069ffca /sshd_config.5 | |
parent | b98a2a8348e907b3d71caafd80f0be8fdd075943 (diff) |
upstream commit
Allow wildcard for PermitOpen hosts as well as ports.
bz#2582, patch from openssh at mzpqnxow.com and jjelen at redhat.com. ok
markus@
Upstream-ID: af0294e9b9394c4e16e991424ca0a47a7cc605f2
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index babe2ae8f..877eb92c5 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.225 2016/06/17 06:33:30 jmc Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.226 2016/07/19 11:38:53 dtucker Exp $ |
37 | .Dd $Mdocdate: June 17 2016 $ | 37 | .Dd $Mdocdate: July 19 2016 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1215,6 +1215,9 @@ can be used to remove all restrictions and permit any forwarding requests. | |||
1215 | An argument of | 1215 | An argument of |
1216 | .Dq none | 1216 | .Dq none |
1217 | can be used to prohibit all forwarding requests. | 1217 | can be used to prohibit all forwarding requests. |
1218 | Wildcard | ||
1219 | .Dq * | ||
1220 | can be used for host or port to allow all hosts or port respectively. | ||
1218 | By default all port forwarding requests are permitted. | 1221 | By default all port forwarding requests are permitted. |
1219 | .It Cm PermitRootLogin | 1222 | .It Cm PermitRootLogin |
1220 | Specifies whether root can log in using | 1223 | Specifies whether root can log in using |