[PATCH] doc: clarify relative Include file as unaffected by ssh -F/sshd -f

Daniel Lublin daniel at lublin.se
Fri May 17 18:57:11 AEST 2024


Signed-off-by: Daniel Lublin <daniel at lublin.se>
---
 ssh_config.5  | 6 +++++-
 sshd_config.5 | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ssh_config.5 b/ssh_config.5
index 2931d807e..a2d03328d 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -1191,7 +1191,11 @@ Files without absolute paths are assumed to be in
 .Pa ~/.ssh
 if included in a user configuration file or
 .Pa /etc/ssh
-if included from the system configuration file.
+if included from the system configuration file (also when
+.Xr ssh 1
+is run with the
+.Fl F
+option).
 .Cm Include
 directive may appear inside a
 .Cm Match
diff --git a/sshd_config.5 b/sshd_config.5
index a0f16874f..20bfccd76 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -915,7 +915,12 @@ Multiple pathnames may be specified and each pathname may contain
 .Xr glob 7
 wildcards that will be expanded and processed in lexical order.
 Files without absolute paths are assumed to be in
-.Pa /etc/ssh .
+.Pa /etc/ssh
+(also when
+.Xr sshd 8
+is run with the
+.Fl f
+option).
 An
 .Cm Include
 directive may appear inside a
-- 
2.45.0



More information about the openssh-unix-dev mailing list