From 9b453b8087304a907be96dbd1b00f111c502b864 Mon Sep 17 00:00:00 2001 From: purplerain Date: Wed, 4 Sep 2024 01:48:09 +0000 Subject: [PATCH] sync with OpenBSD -current --- lib/libc/asr/gethostnamadr_async.c | 4 ++-- lib/libc/net/res_random.c | 4 ++-- usr.sbin/smtpd/mta_session.c | 4 ++-- usr.sbin/smtpd/scheduler_ramqueue.c | 4 ++-- usr.sbin/smtpd/smtpd.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libc/asr/gethostnamadr_async.c b/lib/libc/asr/gethostnamadr_async.c index c570be34d..1be4f608d 100644 --- a/lib/libc/asr/gethostnamadr_async.c +++ b/lib/libc/asr/gethostnamadr_async.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gethostnamadr_async.c,v 1.49 2023/11/22 13:19:31 florian Exp $ */ +/* $OpenBSD: gethostnamadr_async.c,v 1.50 2024/09/03 18:20:35 op Exp $ */ /* * Copyright (c) 2012 Eric Faurot * @@ -329,7 +329,7 @@ gethostnamadr_async_run(struct asr_query *as, struct asr_result *ar) /* * We either got no packet or a packet without an answer. - * Saveguard the h_errno and use the next DB. + * Safeguard the h_errno and use the next DB. */ if (ar->ar_count == 0) { free(ar->ar_data); diff --git a/lib/libc/net/res_random.c b/lib/libc/net/res_random.c index e8ee43fe0..d55f505e1 100644 --- a/lib/libc/net/res_random.c +++ b/lib/libc/net/res_random.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_random.c,v 1.26 2022/12/27 17:10:06 jmc Exp $ */ +/* $OpenBSD: res_random.c,v 1.27 2024/09/03 18:21:55 op Exp $ */ /* * Copyright 1997 Niels Provos @@ -51,7 +51,7 @@ * The transaction id is determined by: * id[n] = seed xor (g^X[n] mod n) * - * Effectivly the id is restricted to the lower 15 bits, thus + * Effectively the id is restricted to the lower 15 bits, thus * yielding two different cycles by toggling the msb on and off. * This avoids reuse issues caused by reseeding. * diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c index 31a1546e9..62a98520b 100644 --- a/usr.sbin/smtpd/mta_session.c +++ b/usr.sbin/smtpd/mta_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta_session.c,v 1.151 2024/01/20 09:01:03 claudio Exp $ */ +/* $OpenBSD: mta_session.c,v 1.152 2024/09/03 18:27:04 op Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard @@ -637,7 +637,7 @@ again: else if (s->relay->secret) { log_debug("debug: mta: %p: not using AUTH on non-TLS " "session", s); - mta_error(s, "Refuse to AUTH over unsecure channel"); + mta_error(s, "Refuse to AUTH over insecure channel"); mta_connect(s); } else { mta_enter_state(s, MTA_READY); diff --git a/usr.sbin/smtpd/scheduler_ramqueue.c b/usr.sbin/smtpd/scheduler_ramqueue.c index 473eb6541..47b198774 100644 --- a/usr.sbin/smtpd/scheduler_ramqueue.c +++ b/usr.sbin/smtpd/scheduler_ramqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scheduler_ramqueue.c,v 1.48 2023/05/31 16:51:46 op Exp $ */ +/* $OpenBSD: scheduler_ramqueue.c,v 1.49 2024/09/03 18:27:04 op Exp $ */ /* * Copyright (c) 2012 Gilles Chehade @@ -846,7 +846,7 @@ rq_queue_merge(struct rq_queue *rq, struct rq_queue *update) while (tree_poproot(&update->messages, &id, (void*)&message)) { if ((tomessage = tree_get(&rq->messages, id)) == NULL) { - /* message does not exist. re-use structure */ + /* message does not exist. reuse structure */ tree_xset(&rq->messages, id, message); continue; } diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index af471ac46..5a50f3669 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.351 2024/05/07 12:10:06 op Exp $ */ +/* $OpenBSD: smtpd.c,v 1.352 2024/09/03 18:27:04 op Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -1803,7 +1803,7 @@ parent_forward_open(char *username, char *directory, uid_t uid, gid_t gid) } if (!secure_file(fd, pathname, directory, uid, 1)) { - log_warnx("warn: smtpd: %s: unsecure file", pathname); + log_warnx("warn: smtpd: %s: insecure file", pathname); close(fd); return -1; }