SecBSD/src
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync code with last improvements from OpenBSD

Browse Source
This commit is contained in:
purplerain 2023-10-05 02:28:34 +00:00
parent c8d82c5de4
commit 736de251f0
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $OpenBSD: GENERIC,v 1.290 2023/09/27 15:18:31 deraadt Exp $ # $OpenBSD: GENERIC,v 1.291 2023/10/04 18:07:13 bluhm Exp $
# #
# Machine-independent option; used by all architectures for their # Machine-independent option; used by all architectures for their
# GENERIC kernel # GENERIC kernel
@ -16,7 +16,7 @@ option KMEMSTATS # collect malloc(9) statistics
option PTRACE # ptrace(2) system call option PTRACE # ptrace(2) system call
#option KVA_GUARDPAGES # slow virtual address recycling (+ guarding) #option KVA_GUARDPAGES # slow virtual address recycling (+ guarding)
#option POOL_DEBUG # pool corruption detection option POOL_DEBUG # pool corruption detection
#option VFSLCKDEBUG # VFS locking checks #option VFSLCKDEBUG # VFS locking checks
option CRYPTO # Cryptographic framework option CRYPTO # Cryptographic framework

6
sys/conf/newvers.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: newvers.sh,v 1.197 2023/09/26 13:27:32 deraadt Exp $ # $OpenBSD: newvers.sh,v 1.198 2023/10/04 15:40:13 bluhm Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
# #
# Copyright (c) 1984, 1986, 1990, 1993 # Copyright (c) 1984, 1986, 1990, 1993
@ -71,9 +71,9 @@ ost="SecBSD"
osr="1.4" osr="1.4"
cat >vers.c <<eof cat >vers.c <<eof
#define STATUS "" /* release */
#if 0
#define STATUS "-current" /* just after a release */ #define STATUS "-current" /* just after a release */
#if 0
#define STATUS "" /* release */
#define STATUS "-beta" /* just before a release */ #define STATUS "-beta" /* just before a release */
#define STATUS "-stable" /* stable branch */ #define STATUS "-stable" /* stable branch */
#endif #endif

14
usr.bin/ssh/ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.386 2023/08/28 09:52:09 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.388 2023/10/04 05:42:10 jmc Exp $
.Dd $Mdocdate: August 28 2023 $ .Dd $Mdocdate: October 4 2023 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -2207,6 +2207,16 @@ accepts all tokens.
and and
.Cm ProxyJump .Cm ProxyJump
accept the tokens %%, %h, %n, %p, and %r. accept the tokens %%, %h, %n, %p, and %r.
.Pp
Note that some of these directives build commands for execution via the shell.
Because
.Xr ssh 1
performs no filtering or escaping of characters that have special meaning in
shell commands (e.g. quotes), it is the user's responsibility to ensure that
the arguments passed to
.Xr ssh 1
do not contain such characters and that tokens are appropriately quoted
when used.
.Sh ENVIRONMENT VARIABLES .Sh ENVIRONMENT VARIABLES
Arguments to some keywords can be expanded at runtime from environment Arguments to some keywords can be expanded at runtime from environment
variables on the client by enclosing them in variables on the client by enclosing them in

4
usr.bin/ssh/version.h
View File

@ -1,3 +1,3 @@
/* $OpenBSD: version.h,v 1.98 2023/08/10 01:01:07 djm Exp $ */ /* $OpenBSD: version.h,v 1.99 2023/10/04 04:04:09 djm Exp $ */
#define SSH_VERSION "OpenSSH_9.4" #define SSH_VERSION "OpenSSH_9.5"