From efea9b3cb3ead7191ee8d81348479750e6eeb0db Mon Sep 17 00:00:00 2001 From: "jsg@openbsd.org" Date: Wed, 16 Sep 2026 07:47:29 +0000 Subject: [PATCH] upstream: spelling; ok deraadt@ OpenBSD-Commit-ID: 3c8e4604f2b7a1adb590ab4a42afd2f6c653be46 --- auth2-pubkey.c | 4 ++-- channels.h | 6 +++--- clientloop.c | 4 ++-- misc-agent.c | 4 ++-- mux.c | 4 ++-- ssh.c | 4 ++-- ssh_config.5 | 4 ++-- sshd.c | 4 ++-- sshd_config.5 | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/auth2-pubkey.c b/auth2-pubkey.c index d9e1e212b..0e914116b 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.129 2026/09/16 00:31:27 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.130 2026/09/16 07:47:29 jsg Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved. @@ -86,7 +86,7 @@ format_key(const struct sshkey *key) /* * Verify that the hostkey in a publickey-hostbound-v00@openssh.com userauth - * request matches the hostkey that was negotiatied during initial KEX. + * request matches the hostkey that was negotiated during initial KEX. */ static void check_hostbound_hostkey(struct ssh *ssh) diff --git a/channels.h b/channels.h index cc520ba13..33fcee769 100644 --- a/channels.h +++ b/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.169 2026/09/16 06:23:15 djm Exp $ */ +/* $OpenBSD: channels.h,v 1.170 2026/09/16 07:47:29 jsg Exp $ */ /* * Author: Tatu Ylonen @@ -176,7 +176,7 @@ struct Channel { u_int local_consumed; u_int local_maxpacket; int extended_usage; - int agent_new; /* For agent listeners, use RFC XXX reqests */ + int agent_new; /* For agent listeners, use RFC XXX requests */ int single_connection; char *ctype; /* const type - NB. not freed on channel_free */ @@ -396,7 +396,7 @@ int chan_is_dead(struct ssh *, Channel *, int); void chan_mark_dead(struct ssh *, Channel *); /* agent forwarding */ -void client_channel_reqest_agent_forwarding(struct ssh *, int); +void client_channel_request_agent_forwarding(struct ssh *, int); /* channel events */ diff --git a/clientloop.c b/clientloop.c index 49950cecc..a45168ec2 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.425 2026/07/01 01:08:51 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.426 2026/09/16 07:47:29 jsg Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -2827,7 +2827,7 @@ client_session2_setup(struct ssh *ssh, int id, int want_tty, int want_subsystem, } void -client_channel_reqest_agent_forwarding(struct ssh *ssh, int id) +client_channel_request_agent_forwarding(struct ssh *ssh, int id) { const char *req = "auth-agent-req@openssh.com"; int r; diff --git a/misc-agent.c b/misc-agent.c index 5f36d726d..9a936938d 100644 --- a/misc-agent.c +++ b/misc-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc-agent.c,v 1.9 2026/09/16 05:03:07 djm Exp $ */ +/* $OpenBSD: misc-agent.c,v 1.10 2026/09/16 07:47:29 jsg Exp $ */ /* * Copyright (c) 2025 Damien Miller * @@ -277,7 +277,7 @@ agent_listener(const char *pathspec, const char *username, uid_t uid, } if (strncmp(pathspec, "shared:", 7) == 0) { if (pathspec[7] != '/') { - error_f("shared agent socket paths must be absoute"); + error_f("shared agent socket paths must be absolute"); goto out; } if ((dir = expand_pathspec(pathspec + 7, diff --git a/mux.c b/mux.c index 0cd169732..e4c2a85ba 100644 --- a/mux.c +++ b/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.113 2026/04/02 07:39:57 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.114 2026/09/16 07:47:29 jsg Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -1446,7 +1446,7 @@ mux_session_confirm(struct ssh *ssh, int id, int success, void *arg) } if (cctx->want_agent_fwd && options.forward_agent) - client_channel_reqest_agent_forwarding(ssh, id); + client_channel_request_agent_forwarding(ssh, id); client_session2_setup(ssh, id, cctx->want_tty, cctx->want_subsys, cctx->term, &cctx->tio, c->rfd, cctx->cmd, cctx->env); diff --git a/ssh.c b/ssh.c index 3eb721211..081f0ba4a 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.639 2026/09/16 06:23:16 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.640 2026/09/16 07:47:29 jsg Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -2197,7 +2197,7 @@ ssh_session2_setup(struct ssh *ssh, int id, int success, void *arg) check_agent_present(); if (options.forward_agent) - client_channel_reqest_agent_forwarding(ssh, id); + client_channel_request_agent_forwarding(ssh, id); if ((term = lookup_env_in_list("TERM", options.setenv, options.num_setenv)) == NULL || *term == '\0') diff --git a/ssh_config.5 b/ssh_config.5 index 8b15cc863..90da5fa6b 100644 --- a/ssh_config.5 +++ b/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.430 2026/09/16 00:13:58 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.431 2026/09/16 07:47:29 jsg Exp $ .Dd $Mdocdate: September 16 2026 $ .Dt SSH_CONFIG 5 .Os @@ -2081,7 +2081,7 @@ The default is USER. Specifies whether the system should send keepalive messages on TCP sockets it has opened. If they are sent, failure of the connection or crash of one -of the endpoins may more promptly detected. +of the endpoints may be more promptly detected. However, this means that connections may terminate if the connection is suffers a transient disruption. .Pp diff --git a/sshd.c b/sshd.c index e6a1fcd9e..da2aba936 100644 --- a/sshd.c +++ b/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.634 2026/09/16 06:12:42 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.635 2026/09/16 07:47:29 jsg Exp $ */ /* * Copyright (c) 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 2002 Niels Provos. All rights reserved. @@ -613,7 +613,7 @@ drop_connection(int sock, int startups, int notify_pipe) if (!should_drop_connection(startups) && srclimit_check_allow(sock, notify_pipe) == 1) return 0; - reason = "Maxstartups"; + reason = "MaxStartups"; rl = &ratelimit_maxstartups; } diff --git a/sshd_config.5 b/sshd_config.5 index f446f094e..3ccfe4fdd 100644 --- a/sshd_config.5 +++ b/sshd_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: sshd_config.5,v 1.407 2026/09/16 00:29:44 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.408 2026/09/16 07:47:29 jsg Exp $ .Dd $Mdocdate: September 16 2026 $ .Dt SSHD_CONFIG 5 .Os @@ -120,7 +120,7 @@ directory and the listening agent socket will be created in that. accepts the tokens described in the .Sx TOKENS section. -The default path speification is +The default path specification is .Pa user:.ssh/agent . .It Cm AllowAgentForwarding Specifies whether @@ -2035,7 +2035,7 @@ The default is AUTH. Specifies whether the system should send keepalive messages on TCP sockets it has opened. If they are sent, failure of the connection or crash of one -of the endpoins may more promptly detected. +of the endpoints may be more promptly detected. However, this means that connections may terminate if the connection is suffers a transient disruption. .Pp