On Fri, Dec 23, 2022 at 10:33:43AM -0500, Paul Tagliamonte wrote:
i've finished with this diff. the usr.sbin parts i didn;t take are
listed below, along with any explanation.
jmc
Index: usr.sbin/smtpd/crypto.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/crypto.c,v
retrieving revision 1.10
diff -u -p -r1.10 crypto.c
--- usr.sbin/smtpd/crypto.c 14 Jun 2021 17:58:15 -0000 1.10
+++ usr.sbin/smtpd/crypto.c 23 Dec 2022 15:20:51 -0000
@@ -375,7 +375,7 @@ main(int argc, char *argv[])
/* uncomment below to provoke integrity check failure */
/*
* fpin = fopen("/tmp/passwd.enc", "a");
- * fprintf(fpin, "borken");
+ * fprintf(fpin, "broken");
* fclose(fpin);
*/
fpin = fopen("/tmp/passwd.enc", "r");
i think it was noted already, but "bork" is a thing. i didn;t touch
this.
Index: usr.sbin/smtpd/mta_session.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mta_session.c,v
retrieving revision 1.147
diff -u -p -r1.147 mta_session.c
--- usr.sbin/smtpd/mta_session.c 26 Sep 2022 08:48:52 -0000 1.147
+++ usr.sbin/smtpd/mta_session.c 23 Dec 2022 15:20:51 -0000
@@ -635,7 +635,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);
ho hum. i left this. the sense seems closer to unsecure debt than
insecure person.
Index: usr.sbin/relayd/relay_http.c
===================================================================
RCS file: /cvs/src/usr.sbin/relayd/relay_http.c,v
retrieving revision 1.83
diff -u -p -r1.83 relay_http.c
--- usr.sbin/relayd/relay_http.c 23 Oct 2021 20:46:18 -0000 1.83
+++ usr.sbin/relayd/relay_http.c 23 Dec 2022 15:20:51 -0000
@@ -281,7 +281,7 @@ relay_read_http(struct bufferevent *bev,
} else {
SIMPLEQ_REMOVE_HEAD(&hs->hs_methods, hmn_entry);
request_method = hmn->hmn_method;
- DPRINTF("%s: session %d dequeing %s", __func__,
+ DPRINTF("%s: session %d dequeuing %s", __func__,
con->se_id,
relay_httpmethod_byid(request_method));
free(hmn);
@@ -335,7 +335,7 @@ relay_read_http(struct bufferevent *bev,
goto fail;
}
hmn->hmn_method = desc->http_method;
- DPRINTF("%s: session %d enqueing %s", __func__,
+ DPRINTF("%s: session %d enqueuing %s", __func__,
con->se_id,
relay_httpmethod_byid(hmn->hmn_method));
SIMPLEQ_INSERT_TAIL(&hs->hs_methods, hmn, hmn_entry);
so "queuing" and "queueing" are both ok. on reflection, i think i will
tweak this one.
Index: usr.sbin/smtpd/smtpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.c,v
retrieving revision 1.343
diff -u -p -r1.343 smtpd.c
--- usr.sbin/smtpd/smtpd.c 18 Feb 2022 16:57:36 -0000 1.343
+++ usr.sbin/smtpd/smtpd.c 23 Dec 2022 15:20:51 -0000
@@ -1802,7 +1802,7 @@ parent_forward_open(char *username, char
}
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;
}
as above
jmc
