From: jsg@openbsd.org <jsg@openbsd.org>
Date: Tue, 3 Dec 2024 22:30:03 +0000 (+0000)
Subject: upstream: spelling; ok djm@
X-Git-Tag: V_10_0_P1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0b03c2534946fc114880092177aa4a3683ced2d;p=thirdparty%2Fopenssh-portable.git

upstream: spelling; ok djm@

OpenBSD-Commit-ID: c8ff3f70020451eef214e598117b7ce1a29853ef
---

diff --git a/clientloop.c b/clientloop.c
index ccd70b5a1..916fc077b 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.409 2024/10/13 22:20:06 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.410 2024/12/03 22:30:03 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -661,7 +661,7 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout,
 
 	/* Don't arm output fd for poll until the timing interval has elapsed... */
 	if (timespeccmp(&now, &next_interval, <))
-		/* ...unless there's x11 communicattion happening */
+		/* ...unless there's x11 communication happening */
 		return x11_channel_used_recently(ssh);
 
 	/* Calculate number of intervals missed since the last check */
diff --git a/monitor.c b/monitor.c
index 84d516829..2179553d3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.245 2024/09/22 12:56:21 jsg Exp $ */
+/* $OpenBSD: monitor.c,v 1.247 2024/12/03 22:30:03 jsg Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -595,7 +595,7 @@ mm_answer_state(struct ssh *ssh, int sock, struct sshbuf *m)
 	    (confdata = sshbuf_new()) == NULL)
 		fatal_f("sshbuf_new failed");
 
-	/* XXX unneccessary? */
+	/* XXX unnecessary? */
 	/* pack includes into a string */
 	TAILQ_FOREACH(item, &includes, entry) {
 		if ((r = sshbuf_put_cstring(inc, item->selector)) != 0 ||
diff --git a/sshd-auth.c b/sshd-auth.c
index bb694dd4a..161194298 100644
--- a/sshd-auth.c
+++ b/sshd-auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: sshd-auth.c,v 1.2 2024/12/03 22:30:03 jsg Exp $ */
 /*
  * SSH2 implementation:
  * Privilege Separation:
@@ -716,7 +716,7 @@ main(int ac, char **av)
 		}
 	}
 	if (!have_key)
-		fatal("internal error: recieved no hostkeys");
+		fatal("internal error: received no hostkeys");
 
 	/* Ensure that umask disallows at least group and world write */
 	new_umask = umask(0077) | 0022;
diff --git a/sshd-debug.sh b/sshd-debug.sh
index 6e290bc65..86a9b37bd 100755
--- a/sshd-debug.sh
+++ b/sshd-debug.sh
@@ -46,7 +46,7 @@ done
 echo >&2 Debugging ${SSHD} auth ${SSHD_AUTH} session ${SSHD_SESSION}
 
 # Append SshdSessionPath and SshdAuthPath pointing to the build directory.
-# If you explicity specify these in the command line, the first-match
+# If you explicitly specify these in the command line, the first-match
 # keyword semantics will override these.
 exec "${SSHD}" $@ \
     -oSshdAuthPath="${SSHD_AUTH}" -oSshdSessionPath="${SSHD_SESSION}"