diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-01-31 22:42:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-02-01 10:20:24 +1100 |
commit | c2bd7f74b0e0f3a3ee9d19ac549e6ba89013abaf (patch) | |
tree | f90d36f2501a863ff0c3d1041d93a2ef827c54d1 /sshd_config.5 | |
parent | ba261a1dd33266168ead4f8f40446dcece4d1600 (diff) |
upstream: Add a sshd_config "Include" directive to allow inclusion
of files. This has sensible semantics wrt Match blocks and accepts glob(3)
patterns to specify the included files. Based on patch by Jakub Jelen in
bz2468; feedback and ok markus@
OpenBSD-Commit-ID: 36ed0e845b872e33f03355b936a4fff02d5794ff
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 1395a5e6d..6c3b5e5e0 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.303 2020/01/28 01:49:36 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.304 2020/01/31 22:42:45 djm Exp $ |
37 | .Dd $Mdocdate: January 28 2020 $ | 37 | .Dd $Mdocdate: January 31 2020 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -801,7 +801,20 @@ during | |||
801 | and use only the system-wide known hosts file | 801 | and use only the system-wide known hosts file |
802 | .Pa /etc/ssh/known_hosts . | 802 | .Pa /etc/ssh/known_hosts . |
803 | The default is | 803 | The default is |
804 | .Cm no . | 804 | .Dq no . |
805 | .It Cm Include | ||
806 | Include the specified configuration file(s). | ||
807 | Multiple path names may be specified and each pathname may contain | ||
808 | .Xr glob 7 | ||
809 | wildcards. | ||
810 | Files without absolute paths are assumed to be in | ||
811 | .Pa /etc/ssh . | ||
812 | A | ||
813 | .Cm Include | ||
814 | directive may appear inside a | ||
815 | .Cm Match | ||
816 | block | ||
817 | to perform conditional inclusion. | ||
805 | .It Cm IPQoS | 818 | .It Cm IPQoS |
806 | Specifies the IPv4 type-of-service or DSCP class for the connection. | 819 | Specifies the IPv4 type-of-service or DSCP class for the connection. |
807 | Accepted values are | 820 | Accepted values are |