From de20c680b1cb29e96c5bff94d7eec9e58cdb8fa0 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 12 Apr 2023 08:53:54 +0000 Subject: [PATCH] fix double words ok dtucker@ --- usr.bin/ssh/PROTOCOL.agent | 4 ++-- usr.bin/ssh/sftp-server.c | 4 ++-- usr.bin/ssh/sftp.c | 4 ++-- usr.bin/ssh/ssh-keygen.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.bin/ssh/PROTOCOL.agent b/usr.bin/ssh/PROTOCOL.agent index dba76b0c014..44e463674f1 100644 --- a/usr.bin/ssh/PROTOCOL.agent +++ b/usr.bin/ssh/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/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c index ce966bcb980..51258d9e801 100644 --- a/usr.bin/ssh/sftp-server.c +++ b/usr.bin/ssh/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. * @@ -597,7 +597,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/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c index 569ef5a0f50..e5e679f87d0 100644 --- a/usr.bin/ssh/sftp.c +++ b/usr.bin/ssh/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 * @@ -597,7 +597,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/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 7900966402c..39d3519c60f 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/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 * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -1163,7 +1163,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) { -- 2.20.1