diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-04-15 02:30:19 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-04-15 03:16:11 +0200 |
| commit | dc7990be865450574c7940c9880567f5d2555b37 (patch) | |
| tree | 1e36b3a59b4a22b6bd649cadb6118193287d8420 /ssh_config.5 | |
| parent | ignore PAM environment vars when UseLogin=yes (diff) | |
| download | openssh-dc7990be865450574c7940c9880567f5d2555b37.tar.xz openssh-dc7990be865450574c7940c9880567f5d2555b37.zip | |
upstream commit
Include directive for ssh_config(5); feedback & ok markus@
Upstream-ID: ae3b76e2e343322b9f74acde6f1e1c5f027d5fff
Diffstat (limited to '')
| -rw-r--r-- | ssh_config.5 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index caf13a62d..880f11049 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.228 2016/02/20 23:01:46 sobrado Exp $ -.Dd $Mdocdate: February 20 2016 $ +.\" $OpenBSD: ssh_config.5,v 1.229 2016/04/15 00:30:19 djm Exp $ +.Dd $Mdocdate: April 15 2016 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1019,6 +1019,25 @@ It is recommended that .Cm IgnoreUnknown be listed early in the configuration file as it will not be applied to unknown options that appear before it. +.It Cm Include +Include the specified configuration file(s). +Multiple path names may be specified and each pathname may contain +.Xr glob 3 +wildcards and, for user configurations, shell-like +.Dq ~ +references to user home directories. +Files without absolute paths are assumed to be in +.Pa ~/.ssh +if included in a user configurations file or +.Pa /etc/ssh +if included from the system configuration file. +.Cm Include +directive may appear inside a +.Cm Match +or +.Cm Host +block +to perform conditional inclusion. .It Cm IPQoS Specifies the IPv4 type-of-service or DSCP class for connections. Accepted values are |