diff options
| author |   djm <djm@openbsd.org> | 2020-05-29 05:37:03 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-05-29 05:37:03 +0000 |
| commit | 61aafd29bf8b69e570404aeccf3fd63db5607b64 (patch) | |
| tree | c82b2fcae9988c272715ee3913273c0e791e6047 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-61aafd29bf8b69e570404aeccf3fd63db5607b64.tar.xz wireguard-openbsd-61aafd29bf8b69e570404aeccf3fd63db5607b64.zip | |
mention that wildcards are processed in lexical order; bz#3165
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index 5d7060211c8..9150832d6e5 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -33,7 +33,7 @@ .\" (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.326 2020/05/29 04:25:40 dtucker Exp $ +.\" $OpenBSD: ssh_config.5,v 1.327 2020/05/29 05:37:03 djm Exp $ .Dd $Mdocdate: May 29 2020 $ .Dt SSH_CONFIG 5 .Os @@ -1010,6 +1010,7 @@ Multiple pathnames may be specified and each pathname may contain wildcards and, for user configurations, shell-like .Sq ~ references to user home directories. +Wildcards will be expanded and processed in lexical order. Files without absolute paths are assumed to be in .Pa ~/.ssh if included in a user configuration file or diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index e22a4a8e579..970add8e240 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_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: sshd_config.5,v 1.311 2020/04/17 06:12:41 jmc Exp $ -.Dd $Mdocdate: April 17 2020 $ +.\" $OpenBSD: sshd_config.5,v 1.312 2020/05/29 05:37:03 djm Exp $ +.Dd $Mdocdate: May 29 2020 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -819,7 +819,7 @@ The default is Include the specified configuration file(s). Multiple pathnames may be specified and each pathname may contain .Xr glob 7 -wildcards. +wildcards that will be expanded and processed in lexical order. Files without absolute paths are assumed to be in .Pa /etc/ssh . An |