upstream: fix double words ok dtucker@

OpenBSD-Commit-ID: 44d3223902fbce5276422bdc8063ab72a4078489

diff --git a/PROTOCOL.agent b/PROTOCOL.agent
index dba76b0c014b4ae685d929934decf83b7507d356..44e463674f1985aeace8130cef172316f8e27732 100644 (file)
--- a/PROTOCOL.agent
+++ b/PROTOCOL.agent
@@ -31,7 +31,7 @@ should be bound for user authentication or forwarding.
 When an agent received this message, it will verify the signature and
 check the consistency of its contents, including refusing to accept
 a duplicate session identifier, or any attempt to bind a connection
-previously bound for authentication. It will then then record the
+previously bound for authentication. It will then record the
 binding for the life of the connection for use later in testing per-key
 destination constraints.
 
@@ -81,4 +81,4 @@ the constraint is:
 
 This option is only valid for XMSS keys.
 
-$OpenBSD: PROTOCOL.agent,v 1.18 2022/09/21 22:26:50 dtucker Exp $
+$OpenBSD: PROTOCOL.agent,v 1.19 2023/04/12 08:53:54 jsg Exp $

diff --git a/sftp-server.c b/sftp-server.c
index 49ca1ca9f700e183ecfd09b5833e725305b8e8f5..0466a0f7fb0bf325949a74624efd42a24d3da93a 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.146 2023/03/07 05:37:26 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.147 2023/04/12 08:53:54 jsg Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -607,7 +607,7 @@ send_handle(u_int32_t id, int handle)
        int hlen;
 
        handle_to_string(handle, &string, &hlen);
-       debug("request %u: sent handle handle %d", id, handle);
+       debug("request %u: sent handle %d", id, handle);
        send_data_or_handle(SSH2_FXP_HANDLE, id, string, hlen);
        free(string);
 }

diff --git a/sftp.c b/sftp.c
index f99f0561ce9237e7fd009324c83177c57d362e63..b113f930973d9fe2d31072a00eb3dfae0a7ee77e 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.233 2023/04/06 03:12:32 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.234 2023/04/12 08:53:54 jsg Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -618,7 +618,7 @@ escape_glob(const char *s)
 
 /*
  * Arg p must be dynamically allocated.  make_absolute will either return it
- * or free it and and allocate a new one.  Caller must free returned string.
+ * or free it and allocate a new one.  Caller must free returned string.
  */
 static char *
 make_absolute_pwd_glob(char *p, const char *pwd)

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 2c0c9cd35ae21655ee960cba1c97bb021b731152..3a0ba8b9e2d86c8dde297c12b33bfcb23a8616d5 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.466 2023/03/08 00:05:37 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.467 2023/04/12 08:53:54 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1186,7 +1186,7 @@ known_hosts_hash(struct hostkey_foreach_line *l, void *_ctx)
        case HKF_STATUS_OK:
        case HKF_STATUS_MATCHED:
                /*
-                * Don't hash hosts already already hashed, with wildcard
+                * Don't hash hosts already hashed, with wildcard
                 * characters or a CA/revocation marker.
                 */
                if (was_hashed || has_wild || l->marker != MRK_NONE) {