upstream: mention that wildcards are processed in lexical order;

bz#3165

OpenBSD-Commit-ID: 8856f3d1612bd42e9ee606d89386cae456dd165c
This commit is contained in:
djm@openbsd.org 2020-05-29 05:37:03 +00:00 committed by Damien Miller
parent 4a1b46e6d0
commit 188e332d1c
2 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -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
@ -817,7 +817,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