diff --git a/docs/sudo_logsrvd.mdoc.in b/docs/sudo_logsrvd.mdoc.in index bde5ff672..94228f9d7 100644 --- a/docs/sudo_logsrvd.mdoc.in +++ b/docs/sudo_logsrvd.mdoc.in @@ -253,7 +253,7 @@ If you enter '.', the field will be left blank. Country Name (2 letter code) [AU]:US State or Province Name (full name) [Some-State]:Colorado Locality Name (eg, city) []: -Organization Name (eg, company) [Internet Widgits Pty Ltd]:sudo +Organization Name (eg, company) [Internet Widgets Pty Ltd]:sudo Organizational Unit Name (eg, section) []:sudo Certificate Authority Common Name (e.g., server FQDN or YOUR name) []:sudo Root CA Email Address []: @@ -302,7 +302,7 @@ If you enter '.', the field will be left blank. Country Name (2 letter code) [AU]:US State or Province Name (full name) [Some-State]:Colorado Locality Name (eg, city) []: -Organization Name (eg, company) [Internet Widgits Pty Ltd]:sudo +Organization Name (eg, company) [Internet Widgets Pty Ltd]:sudo Organizational Unit Name (eg, section) []:sudo log server Common Name (e.g., server FQDN or YOUR name) []:logserver.example.com Email Address []: diff --git a/docs/sudo_plugin.mdoc.in b/docs/sudo_plugin.mdoc.in index a8cd1c776..edbacc38b 100644 --- a/docs/sudo_plugin.mdoc.in +++ b/docs/sudo_plugin.mdoc.in @@ -1399,7 +1399,7 @@ front-end to determine which elements of the vector are files to be edited. The .Ql -- -element must immediately precede the first file to be editied. +element must immediately precede the first file to be edited. If .Em sudoedit_nfiles is not specified, the diff --git a/docs/sudoers.mdoc.in b/docs/sudoers.mdoc.in index e11f5aa54..1dc6aee5c 100644 --- a/docs/sudoers.mdoc.in +++ b/docs/sudoers.mdoc.in @@ -4186,7 +4186,7 @@ it will .Dq roll over to zero, after which .Nm -will truncate and re-use any existing I/O log path names. +will truncate and reuse any existing I/O log path names. .Pp This setting is only supported by version 1.8.7 or higher. .It passwd_tries @@ -6353,7 +6353,7 @@ Once the I/O log sequence number reaches .Em maxseq , it will be reset to zero and .Nm -will truncate and re-use any existing I/O logs. +will truncate and reuse any existing I/O logs. .Sh FILES .Bl -tag -width 24n .It Pa @sysconfdir@/sudo.conf @@ -7333,7 +7333,7 @@ If no terminal is present or the option is set to .Dq ppid , the start time of the parent process is used instead. -In most cases this will prevent a time stamp record from being re-used +In most cases this will prevent a time stamp record from being reused without the user entering a password when logging out and back in again. .Sh DEBUGGING Versions 1.8.4 and higher of the diff --git a/docs/sudoers_timestamp.mdoc.in b/docs/sudoers_timestamp.mdoc.in index 8856cee3d..e04e5b9e8 100644 --- a/docs/sudoers_timestamp.mdoc.in +++ b/docs/sudoers_timestamp.mdoc.in @@ -128,7 +128,7 @@ or of the parent process for records of type .Dv TS_PPID . The .Em start_time -is used to help prevent re-use of a time stamp record after a +is used to help prevent reuse of a time stamp record after a user has logged out. Not all systems support a method to easily retrieve a process's start time. @@ -239,12 +239,12 @@ Information about the terminal device was stored in tty-based time stamp files for validity checks. This included the terminal device numbers, inode number and, on systems where it was not updated when the device was written to, the inode change time. -This helped prevent re-use of the time stamp file after logout. +This helped prevent reuse of the time stamp file after logout. .It 1.8.6p7 The terminal session ID was added to tty-based time stamp files to -prevent re-use of the time stamp by the same user in a different +prevent reuse of the time stamp by the same user in a different terminal session. -It also helped prevent re-use of the time stamp file on systems where +It also helped prevent reuse of the time stamp file on systems where the terminal device's inode change time was updated by writing. .It 1.8.10 A new, multi-record time stamp file format was introduced that uses a @@ -258,7 +258,7 @@ entire file and the lock is held until authentication is complete. .It 1.8.22 The start time of the terminal session leader or parent process is now stored in non-global time stamp records. -This prevents re-use of the time stamp file after logout in most cases. +This prevents reuse of the time stamp file after logout in most cases. .Pp Support was added for the kernel-based tty time stamps available in .Ox diff --git a/etc/codespell.exclude b/etc/codespell.exclude index b89f656b3..c8c5a6f1c 100644 --- a/etc/codespell.exclude +++ b/etc/codespell.exclude @@ -1,4 +1,4 @@ - "You empty-headed animal food trough wiper!", + N_("You empty-headed animal food trough wiper!"), * Returns true if any tags set in nt differ between ot and nt, else false. #define TAGS_CHANGED(ot, nt) \ ((TAG_SET((nt).follow) && (nt).follow != (ot).follow) || \ @@ -33,3 +33,4 @@ * Tim Fraser echo ".Nd sudo" >> conftest * as per FIPS 180-4: Secure Hash Standard (SHS) + { "wast", tZONE, -HOUR(7) }, /* West Australian Standard */ diff --git a/lib/util/lbuf.c b/lib/util/lbuf.c index 7ac864e8a..9480644b9 100644 --- a/lib/util/lbuf.c +++ b/lib/util/lbuf.c @@ -474,7 +474,7 @@ sudo_lbuf_print_v1(struct sudo_lbuf *lbuf) } done: - lbuf->len = 0; /* reset the buffer for re-use. */ + lbuf->len = 0; /* reset the buffer for reuse. */ lbuf->error = 0; debug_return; diff --git a/logsrvd/logsrvd_journal.c b/logsrvd/logsrvd_journal.c index e4d2083f1..d26e1b18d 100644 --- a/logsrvd/logsrvd_journal.c +++ b/logsrvd/logsrvd_journal.c @@ -484,7 +484,7 @@ journal_accept(AcceptMessage *msg, uint8_t *buf, size_t len, debug_decl(journal_accept, SUDO_DEBUG_UTIL); if (closure->journal_path != NULL) { - /* Re-use existing journal file. */ + /* Reuse existing journal file. */ debug_return_bool(journal_write(buf, len, closure)); } diff --git a/plugins/sudoers/parse_ldif.c b/plugins/sudoers/parse_ldif.c index ceab19b9d..60249d6c4 100644 --- a/plugins/sudoers/parse_ldif.c +++ b/plugins/sudoers/parse_ldif.c @@ -333,7 +333,7 @@ role_to_sudoers(struct sudoers_parse_tree *parse_tree, struct sudo_role *role, */ if (reuse_userspec) { - /* Re-use the previous userspec */ + /* Reuse the previous userspec */ us = TAILQ_LAST(&parse_tree->userspecs, userspec_list); } else { /* Allocate a new userspec and fill in the user list. */ @@ -388,7 +388,7 @@ role_to_sudoers(struct sudoers_parse_tree *parse_tree, struct sudo_role *role, if (role->cn != NULL) { struct sudoers_comment *comment = NULL; if (reuse_userspec) { - /* Try to re-use comment too. */ + /* Try to reuse comment too. */ STAILQ_FOREACH(comment, &us->comments, entries) { if (strncasecmp(comment->str, "sudoRole ", 9) == 0) { char *tmpstr; diff --git a/src/exec_intercept.c b/src/exec_intercept.c index de9d894ba..005b7ed8f 100644 --- a/src/exec_intercept.c +++ b/src/exec_intercept.c @@ -145,7 +145,7 @@ bad: } /* - * Reset intercept_closure so it can be re-used. + * Reset intercept_closure so it can be reused. */ void intercept_closure_reset(struct intercept_closure *closure) @@ -777,7 +777,7 @@ unpack: if (!ret) goto done; if (!ISSET(closure->details->flags, CD_INTERCEPT)) { - /* Just logging, re-use event to read next InterceptHello. */ + /* Just logging, reuse event to read next InterceptHello. */ ret = enable_read_event(fd, RECV_HELLO, intercept_cb, closure); goto done; } @@ -987,7 +987,7 @@ intercept_write(int fd, struct intercept_closure *closure) switch (closure->state) { case RECV_HELLO_INITIAL: - /* Re-use the listener event. */ + /* Reuse the listener event. */ close(fd); if (!enable_read_event(closure->listen_sock, RECV_CONNECTION, intercept_accept_cb, closure)) @@ -997,7 +997,7 @@ intercept_write(int fd, struct intercept_closure *closure) accept_closure = closure; break; case POLICY_ACCEPT: - /* Re-use event to read InterceptHello from sudo_intercept.so ctor. */ + /* Reuse event to read InterceptHello from sudo_intercept.so ctor. */ if (!enable_read_event(fd, RECV_HELLO, intercept_cb, closure)) goto done; break;