From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 9 Apr 2025 01:24:40 +0000 (+0000)
Subject: upstream: oops, I accidentally backed out the typo fix
X-Git-Tag: V_10_0_P1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd73459e351b0a2908aed90910c8ff9b0b381c6d;p=thirdparty%2Fopenssh-portable.git

upstream: oops, I accidentally backed out the typo fix

OpenBSD-Commit-ID: f485f79bf3e9ebbe1de13ac96150cf458956cfd8
---

diff --git a/ssh.c b/ssh.c
index fb4e69a0c..dc4886d0e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.611 2025/04/09 01:23:47 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.612 2025/04/09 01:24:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1463,7 +1463,7 @@ main(int ac, char **av)
 			fatal("remote username contains invalid characters");
 	}
 
-	/* Now User is expanded, store it an calculate hash. */
+	/* Now User is expanded, store it and calculate hash. */
 	cinfo->remuser = xstrdup(options.user);
 	cinfo->conn_hash_hex = ssh_connection_hash(cinfo->thishost,
 	    cinfo->remhost, cinfo->portstr, cinfo->remuser, cinfo->jmphost);