diff --git a/plugins/sudoers/po/sudoers.pot b/plugins/sudoers/po/sudoers.pot
index 7406e3669..d51f13a25 100644
--- a/plugins/sudoers/po/sudoers.pot
+++ b/plugins/sudoers/po/sudoers.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sudo 1.9.16\n"
+"Project-Id-Version: sudo 1.9.16p2\n"
 "Report-Msgid-Bugs-To: https://bugzilla.sudo.ws\n"
-"POT-Creation-Date: 2024-06-08 09:06-0600\n"
+"POT-Creation-Date: 2025-06-08 16:30-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: confstr.sh:1 gram.y:1240 plugins/sudoers/logging.c:919
+#: confstr.sh:1 gram.y:1190 plugins/sudoers/logging.c:929
 msgid "syntax error"
 msgstr ""
 
@@ -41,13 +41,13 @@ msgstr ""
 msgid "Sorry, try again."
 msgstr ""
 
-#: gram.y:238 gram.y:305 gram.y:314 gram.y:323 gram.y:333 gram.y:343 gram.y:367
-#: gram.y:394 gram.y:403 gram.y:411 gram.y:420 gram.y:429 gram.y:502 gram.y:512
-#: gram.y:524 gram.y:566 gram.y:575 gram.y:584 gram.y:593 gram.y:726 gram.y:735
-#: gram.y:750 gram.y:770 gram.y:789 gram.y:942 gram.y:947 gram.y:955 gram.y:969
-#: gram.y:975 gram.y:987 gram.y:993 gram.y:1118 gram.y:1127 gram.y:1135
-#: gram.y:1144 gram.y:1153 gram.y:1182 gram.y:1191 gram.y:1199 gram.y:1300
-#: gram.y:1430 gram.y:1811 gram.y:1822 gram.y:1898 lib/eventlog/eventlog.c:236
+#: gram.y:239 gram.y:306 gram.y:315 gram.y:324 gram.y:334 gram.y:344 gram.y:368
+#: gram.y:395 gram.y:404 gram.y:412 gram.y:421 gram.y:430 gram.y:452 gram.y:462
+#: gram.y:474 gram.y:516 gram.y:525 gram.y:534 gram.y:543 gram.y:676 gram.y:685
+#: gram.y:700 gram.y:720 gram.y:739 gram.y:892 gram.y:897 gram.y:905 gram.y:919
+#: gram.y:925 gram.y:937 gram.y:943 gram.y:1068 gram.y:1077 gram.y:1085
+#: gram.y:1094 gram.y:1103 gram.y:1132 gram.y:1141 gram.y:1149 gram.y:1264
+#: gram.y:1395 gram.y:1776 gram.y:1787 gram.y:1922 lib/eventlog/eventlog.c:236
 #: lib/eventlog/eventlog.c:313 lib/eventlog/eventlog.c:778
 #: lib/eventlog/eventlog.c:855 lib/eventlog/eventlog.c:1189
 #: lib/eventlog/parse_json.c:185 lib/eventlog/parse_json.c:501
@@ -57,18 +57,18 @@ msgstr ""
 #: lib/iolog/iolog_legacy.c:124 lib/iolog/iolog_legacy.c:134
 #: lib/iolog/iolog_legacy.c:140 lib/iolog/iolog_loginfo.c:76
 #: lib/iolog/iolog_loginfo.c:212 logsrvd/iolog_writer.c:95
-#: logsrvd/iolog_writer.c:100 logsrvd/iolog_writer.c:134
-#: logsrvd/iolog_writer.c:147 logsrvd/iolog_writer.c:185
-#: logsrvd/iolog_writer.c:218 logsrvd/iolog_writer.c:228
-#: logsrvd/iolog_writer.c:257 logsrvd/iolog_writer.c:278
-#: logsrvd/iolog_writer.c:290 logsrvd/iolog_writer.c:300
-#: logsrvd/iolog_writer.c:318 logsrvd/iolog_writer.c:328
-#: logsrvd/iolog_writer.c:338 logsrvd/iolog_writer.c:350
-#: logsrvd/iolog_writer.c:385 logsrvd/iolog_writer.c:391
-#: logsrvd/iolog_writer.c:398 logsrvd/iolog_writer.c:404
-#: logsrvd/iolog_writer.c:588 logsrvd/logsrv_util.c:92 logsrvd/logsrvd.c:324
-#: logsrvd/logsrvd.c:1058 logsrvd/logsrvd.c:1121 logsrvd/logsrvd.c:1599
-#: logsrvd/logsrvd.c:1604 logsrvd/logsrvd.c:1791 logsrvd/logsrvd.c:2046
+#: logsrvd/iolog_writer.c:100 logsrvd/iolog_writer.c:148
+#: logsrvd/iolog_writer.c:161 logsrvd/iolog_writer.c:200
+#: logsrvd/iolog_writer.c:235 logsrvd/iolog_writer.c:246
+#: logsrvd/iolog_writer.c:277 logsrvd/iolog_writer.c:299
+#: logsrvd/iolog_writer.c:312 logsrvd/iolog_writer.c:323
+#: logsrvd/iolog_writer.c:343 logsrvd/iolog_writer.c:354
+#: logsrvd/iolog_writer.c:365 logsrvd/iolog_writer.c:378
+#: logsrvd/iolog_writer.c:413 logsrvd/iolog_writer.c:419
+#: logsrvd/iolog_writer.c:426 logsrvd/iolog_writer.c:432
+#: logsrvd/iolog_writer.c:616 logsrvd/logsrv_util.c:92 logsrvd/logsrvd.c:324
+#: logsrvd/logsrvd.c:1062 logsrvd/logsrvd.c:1128 logsrvd/logsrvd.c:1606
+#: logsrvd/logsrvd.c:1611 logsrvd/logsrvd.c:1798 logsrvd/logsrvd.c:2053
 #: logsrvd/logsrvd_conf.c:357 logsrvd/logsrvd_conf.c:370
 #: logsrvd/logsrvd_conf.c:511 logsrvd/logsrvd_conf.c:534
 #: logsrvd/logsrvd_conf.c:538 logsrvd/logsrvd_conf.c:556
@@ -84,19 +84,19 @@ msgstr ""
 #: logsrvd/logsrvd_journal.c:76 logsrvd/logsrvd_journal.c:216
 #: logsrvd/logsrvd_journal.c:217 logsrvd/logsrvd_journal.c:274
 #: logsrvd/logsrvd_journal.c:279 logsrvd/logsrvd_journal.c:439
-#: logsrvd/logsrvd_journal.c:441 logsrvd/logsrvd_local.c:215
-#: logsrvd/logsrvd_local.c:216 logsrvd/logsrvd_local.c:278
-#: logsrvd/logsrvd_local.c:279 logsrvd/logsrvd_local.c:417
-#: logsrvd/logsrvd_local.c:468 logsrvd/logsrvd_local.c:469
-#: logsrvd/logsrvd_local.c:474 logsrvd/logsrvd_local.c:475
+#: logsrvd/logsrvd_journal.c:441 logsrvd/logsrvd_local.c:216
+#: logsrvd/logsrvd_local.c:217 logsrvd/logsrvd_local.c:280
+#: logsrvd/logsrvd_local.c:281 logsrvd/logsrvd_local.c:420
+#: logsrvd/logsrvd_local.c:471 logsrvd/logsrvd_local.c:472
+#: logsrvd/logsrvd_local.c:477 logsrvd/logsrvd_local.c:478
 #: logsrvd/logsrvd_queue.c:159 logsrvd/logsrvd_queue.c:189
 #: logsrvd/logsrvd_queue.c:266 logsrvd/logsrvd_relay.c:446
-#: logsrvd/logsrvd_relay.c:748 logsrvd/logsrvd_relay.c:855
+#: logsrvd/logsrvd_relay.c:748 logsrvd/logsrvd_relay.c:861
 #: logsrvd/sendlog.c:256 logsrvd/sendlog.c:265 logsrvd/sendlog.c:297
 #: logsrvd/sendlog.c:303 logsrvd/sendlog.c:352 logsrvd/sendlog.c:651
-#: logsrvd/sendlog.c:1847 plugins/sudoers/audit.c:118
+#: logsrvd/sendlog.c:1857 plugins/sudoers/audit.c:118
 #: plugins/sudoers/auth/bsdauth.c:154 plugins/sudoers/auth/kerb5.c:123
-#: plugins/sudoers/auth/kerb5.c:151 plugins/sudoers/auth/pam.c:697
+#: plugins/sudoers/auth/kerb5.c:151 plugins/sudoers/auth/pam.c:708
 #: plugins/sudoers/auth/rfc1938.c:112 plugins/sudoers/auth/sia.c:61
 #: plugins/sudoers/canon_path.c:129 plugins/sudoers/canon_path.c:161
 #: plugins/sudoers/check_aliases.c:128 plugins/sudoers/check_util.c:56
@@ -122,9 +122,9 @@ msgstr ""
 #: plugins/sudoers/cvtsudoers_merge.c:588
 #: plugins/sudoers/cvtsudoers_merge.c:664
 #: plugins/sudoers/cvtsudoers_merge.c:1197
-#: plugins/sudoers/cvtsudoers_merge.c:1281 plugins/sudoers/defaults.c:455
-#: plugins/sudoers/defaults.c:690 plugins/sudoers/defaults.c:1062
-#: plugins/sudoers/defaults.c:1248 plugins/sudoers/editor.c:198
+#: plugins/sudoers/cvtsudoers_merge.c:1281 plugins/sudoers/defaults.c:457
+#: plugins/sudoers/defaults.c:692 plugins/sudoers/defaults.c:1064
+#: plugins/sudoers/defaults.c:1250 plugins/sudoers/editor.c:198
 #: plugins/sudoers/env.c:280 plugins/sudoers/exptilde.c:92
 #: plugins/sudoers/filedigest.c:66 plugins/sudoers/filedigest.c:70
 #: plugins/sudoers/gc.c:57 plugins/sudoers/group_plugin.c:212
@@ -132,9 +132,9 @@ msgstr ""
 #: plugins/sudoers/iolog.c:683 plugins/sudoers/iolog.c:711
 #: plugins/sudoers/ldap.c:161 plugins/sudoers/ldap.c:448
 #: plugins/sudoers/ldap.c:625 plugins/sudoers/ldap.c:789
-#: plugins/sudoers/ldap.c:1214 plugins/sudoers/ldap.c:1642
-#: plugins/sudoers/ldap.c:1679 plugins/sudoers/ldap.c:1897
-#: plugins/sudoers/ldap.c:2007 plugins/sudoers/ldap.c:2023
+#: plugins/sudoers/ldap.c:1214 plugins/sudoers/ldap.c:1648
+#: plugins/sudoers/ldap.c:1685 plugins/sudoers/ldap.c:1903
+#: plugins/sudoers/ldap.c:2013 plugins/sudoers/ldap.c:2029
 #: plugins/sudoers/ldap_conf.c:215 plugins/sudoers/ldap_conf.c:247
 #: plugins/sudoers/ldap_conf.c:299 plugins/sudoers/ldap_conf.c:335
 #: plugins/sudoers/ldap_conf.c:441 plugins/sudoers/ldap_conf.c:456
@@ -146,10 +146,10 @@ msgstr ""
 #: plugins/sudoers/log_client.c:726 plugins/sudoers/log_client.c:748
 #: plugins/sudoers/log_client.c:753 plugins/sudoers/log_client.c:1449
 #: plugins/sudoers/log_client.c:1570 plugins/sudoers/log_client.c:1693
-#: plugins/sudoers/log_client.c:2018 plugins/sudoers/log_client.c:2077
+#: plugins/sudoers/log_client.c:2025 plugins/sudoers/log_client.c:2084
 #: plugins/sudoers/logging.c:110 plugins/sudoers/logging.c:190
-#: plugins/sudoers/logging.c:483 plugins/sudoers/logging.c:723
-#: plugins/sudoers/logging.c:880 plugins/sudoers/lookup.c:331
+#: plugins/sudoers/logging.c:485 plugins/sudoers/logging.c:733
+#: plugins/sudoers/logging.c:890 plugins/sudoers/lookup.c:331
 #: plugins/sudoers/lookup.c:348 plugins/sudoers/lookup.c:366
 #: plugins/sudoers/lookup.c:384 plugins/sudoers/lookup.c:401
 #: plugins/sudoers/lookup.c:423 plugins/sudoers/lookup.c:434
@@ -166,7 +166,7 @@ msgstr ""
 #: plugins/sudoers/parse_ldif.c:625 plugins/sudoers/parse_ldif.c:650
 #: plugins/sudoers/parse_ldif.c:708 plugins/sudoers/parse_ldif.c:725
 #: plugins/sudoers/parse_ldif.c:753 plugins/sudoers/parse_ldif.c:760
-#: plugins/sudoers/policy.c:654 plugins/sudoers/policy.c:1071
+#: plugins/sudoers/policy.c:657 plugins/sudoers/policy.c:1074
 #: plugins/sudoers/prompt.c:94 plugins/sudoers/pwutil.c:219
 #: plugins/sudoers/pwutil.c:290 plugins/sudoers/pwutil.c:368
 #: plugins/sudoers/pwutil.c:542 plugins/sudoers/pwutil.c:607
@@ -191,78 +191,88 @@ msgstr ""
 #: plugins/sudoers/testsudoers.c:282 plugins/sudoers/testsudoers.c:302
 #: plugins/sudoers/testsudoers.c:756 plugins/sudoers/timestamp.c:468
 #: plugins/sudoers/timestamp.c:514 plugins/sudoers/timestamp.c:1045
-#: plugins/sudoers/timestamp.c:1248 plugins/sudoers/toke_util.c:79
-#: plugins/sudoers/toke_util.c:108 plugins/sudoers/toke_util.c:134
-#: plugins/sudoers/toke_util.c:164 plugins/sudoers/toke_util.c:204
+#: plugins/sudoers/timestamp.c:1248 plugins/sudoers/toke_util.c:80
+#: plugins/sudoers/toke_util.c:109 plugins/sudoers/toke_util.c:135
+#: plugins/sudoers/toke_util.c:165 plugins/sudoers/toke_util.c:205
 #: plugins/sudoers/tsdump.c:136 plugins/sudoers/visudo.c:151
 #: plugins/sudoers/visudo.c:258 plugins/sudoers/visudo.c:383
 #: plugins/sudoers/visudo.c:389 plugins/sudoers/visudo.c:501
 #: plugins/sudoers/visudo.c:1073 plugins/sudoers/visudo.c:1095
 #: plugins/sudoers/visudo.c:1189 toke.l:1011 toke.l:1174 toke.l:1193
-#: toke.l:1220 toke.l:1300
+#: toke.l:1221 toke.l:1301
 msgid "unable to allocate memory"
 msgstr ""
 
-#: gram.y:617
+#: gram.y:567
 msgid "a digest requires a path name"
 msgstr ""
 
-#: gram.y:639
+#: gram.y:589
 msgid "values for \"CWD\" must start with a '/', '~', or '*'"
 msgstr ""
 
-#: gram.y:645
+#: gram.y:595
 msgid "\"CWD\" path too long"
 msgstr ""
 
-#: gram.y:655
+#: gram.y:605
 msgid "values for \"CHROOT\" must start with a '/', '~', or '*'"
 msgstr ""
 
-#: gram.y:661
+#: gram.y:611
 msgid "\"CHROOT\" path too long"
 msgstr ""
 
-#: gram.y:810
+#: gram.y:760
 #, c-format
 msgid "syntax error, reserved word %s used as an alias name"
 msgstr ""
 
-#: gram.y:833
+#: gram.y:783
 msgid "invalid notbefore value"
 msgstr ""
 
-#: gram.y:842
+#: gram.y:792
 msgid "invalid notafter value"
 msgstr ""
 
-#: gram.y:852 plugins/sudoers/policy.c:373
+#: gram.y:802 plugins/sudoers/policy.c:373
 msgid "timeout value too large"
 msgstr ""
 
-#: gram.y:854 plugins/sudoers/policy.c:375
+#: gram.y:804 plugins/sudoers/policy.c:375
 msgid "invalid timeout value"
 msgstr ""
 
-#: gram.y:965 plugins/sudoers/sudoers.c:1180
+#: gram.y:915 plugins/sudoers/sudoers.c:1180
 msgid "command too long"
 msgstr ""
 
-#: gram.y:999
+#: gram.y:949
 msgid "expected a fully-qualified path name"
 msgstr ""
 
-#: gram.y:1244
+#: gram.y:1194
 #, c-format
 msgid "%s:%d:%zu: %s\n"
 msgstr ""
 
-#: gram.y:1298
+#: gram.y:1251
 #, c-format
-msgid "Alias \"%s\" already defined"
+msgid "duplicate %s \"%s\", previously defined at %s:%d:%d"
 msgstr ""
 
-#: gram.y:1811 gram.y:1822 gram.y:1898 lib/eventlog/eventlog.c:236
+#: gram.y:1256 plugins/sudoers/check_aliases.c:93
+#, c-format
+msgid "cycle in %s \"%s\""
+msgstr ""
+
+#: gram.y:1259
+#, c-format
+msgid "duplicate %s \"%s\""
+msgstr ""
+
+#: gram.y:1776 gram.y:1787 gram.y:1922 lib/eventlog/eventlog.c:236
 #: lib/eventlog/eventlog.c:778 lib/eventlog/eventlog.c:851
 #: lib/eventlog/eventlog.c:854 lib/eventlog/eventlog.c:1189
 #: lib/eventlog/parse_json.c:185 lib/eventlog/parse_json.c:500
@@ -272,23 +282,23 @@ msgstr ""
 #: lib/iolog/iolog_legacy.c:124 lib/iolog/iolog_legacy.c:134
 #: lib/iolog/iolog_legacy.c:140 lib/iolog/iolog_loginfo.c:76
 #: lib/iolog/iolog_loginfo.c:212 logsrvd/iolog_writer.c:95
-#: logsrvd/iolog_writer.c:100 logsrvd/iolog_writer.c:134
-#: logsrvd/iolog_writer.c:147 logsrvd/iolog_writer.c:174
-#: logsrvd/iolog_writer.c:184 logsrvd/iolog_writer.c:197
-#: logsrvd/iolog_writer.c:217 logsrvd/iolog_writer.c:227
-#: logsrvd/iolog_writer.c:246 logsrvd/iolog_writer.c:256
-#: logsrvd/iolog_writer.c:267 logsrvd/iolog_writer.c:277
-#: logsrvd/iolog_writer.c:289 logsrvd/iolog_writer.c:299
-#: logsrvd/iolog_writer.c:317 logsrvd/iolog_writer.c:327
-#: logsrvd/iolog_writer.c:337 logsrvd/iolog_writer.c:349
-#: logsrvd/iolog_writer.c:385 logsrvd/iolog_writer.c:391
-#: logsrvd/iolog_writer.c:398 logsrvd/iolog_writer.c:404
-#: logsrvd/iolog_writer.c:588 logsrvd/logsrv_util.c:92 logsrvd/logsrvd.c:324
+#: logsrvd/iolog_writer.c:100 logsrvd/iolog_writer.c:148
+#: logsrvd/iolog_writer.c:161 logsrvd/iolog_writer.c:188
+#: logsrvd/iolog_writer.c:199 logsrvd/iolog_writer.c:212
+#: logsrvd/iolog_writer.c:234 logsrvd/iolog_writer.c:245
+#: logsrvd/iolog_writer.c:265 logsrvd/iolog_writer.c:276
+#: logsrvd/iolog_writer.c:287 logsrvd/iolog_writer.c:298
+#: logsrvd/iolog_writer.c:311 logsrvd/iolog_writer.c:322
+#: logsrvd/iolog_writer.c:342 logsrvd/iolog_writer.c:353
+#: logsrvd/iolog_writer.c:364 logsrvd/iolog_writer.c:377
+#: logsrvd/iolog_writer.c:413 logsrvd/iolog_writer.c:419
+#: logsrvd/iolog_writer.c:426 logsrvd/iolog_writer.c:432
+#: logsrvd/iolog_writer.c:616 logsrvd/logsrv_util.c:92 logsrvd/logsrvd.c:324
 #: logsrvd/logsrvd.c:462 logsrvd/logsrvd.c:499 logsrvd/logsrvd.c:531
 #: logsrvd/logsrvd.c:585 logsrvd/logsrvd.c:620 logsrvd/logsrvd.c:669
-#: logsrvd/logsrvd.c:705 logsrvd/logsrvd.c:741 logsrvd/logsrvd.c:1132
-#: logsrvd/logsrvd.c:1456 logsrvd/logsrvd.c:1463 logsrvd/logsrvd.c:1599
-#: logsrvd/logsrvd.c:1604 logsrvd/logsrvd.c:1791 logsrvd/logsrvd.c:2046
+#: logsrvd/logsrvd.c:705 logsrvd/logsrvd.c:741 logsrvd/logsrvd.c:1139
+#: logsrvd/logsrvd.c:1463 logsrvd/logsrvd.c:1470 logsrvd/logsrvd.c:1606
+#: logsrvd/logsrvd.c:1611 logsrvd/logsrvd.c:1798 logsrvd/logsrvd.c:2053
 #: logsrvd/logsrvd_conf.c:357 logsrvd/logsrvd_conf.c:370
 #: logsrvd/logsrvd_conf.c:511 logsrvd/logsrvd_conf.c:534
 #: logsrvd/logsrvd_conf.c:538 logsrvd/logsrvd_conf.c:556
@@ -305,16 +315,16 @@ msgstr ""
 #: logsrvd/logsrvd_journal.c:216 logsrvd/logsrvd_journal.c:246
 #: logsrvd/logsrvd_journal.c:250 logsrvd/logsrvd_journal.c:258
 #: logsrvd/logsrvd_journal.c:287 logsrvd/logsrvd_journal.c:291
-#: logsrvd/logsrvd_journal.c:439 logsrvd/logsrvd_local.c:215
-#: logsrvd/logsrvd_local.c:278 logsrvd/logsrvd_local.c:468
-#: logsrvd/logsrvd_local.c:474 logsrvd/logsrvd_local.c:493
+#: logsrvd/logsrvd_journal.c:439 logsrvd/logsrvd_local.c:216
+#: logsrvd/logsrvd_local.c:280 logsrvd/logsrvd_local.c:471
+#: logsrvd/logsrvd_local.c:477 logsrvd/logsrvd_local.c:496
 #: logsrvd/logsrvd_queue.c:158 logsrvd/logsrvd_queue.c:189
 #: logsrvd/logsrvd_queue.c:266 logsrvd/sendlog.c:256 logsrvd/sendlog.c:265
 #: logsrvd/sendlog.c:297 logsrvd/sendlog.c:303 logsrvd/sendlog.c:352
-#: logsrvd/sendlog.c:651 logsrvd/sendlog.c:1548 logsrvd/sendlog.c:1555
-#: logsrvd/sendlog.c:1778 logsrvd/sendlog.c:1847 logsrvd/tls_init.c:305
+#: logsrvd/sendlog.c:651 logsrvd/sendlog.c:1558 logsrvd/sendlog.c:1565
+#: logsrvd/sendlog.c:1788 logsrvd/sendlog.c:1857 logsrvd/tls_init.c:305
 #: logsrvd/tls_init.c:329 logsrvd/tls_init.c:340 plugins/sudoers/audit.c:118
-#: plugins/sudoers/auth/pam.c:518 plugins/sudoers/auth/pam.c:697
+#: plugins/sudoers/auth/pam.c:529 plugins/sudoers/auth/pam.c:708
 #: plugins/sudoers/auth/rfc1938.c:112 plugins/sudoers/canon_path.c:129
 #: plugins/sudoers/canon_path.c:161 plugins/sudoers/check_aliases.c:128
 #: plugins/sudoers/check_util.c:56 plugins/sudoers/check_util.c:84
@@ -340,9 +350,9 @@ msgstr ""
 #: plugins/sudoers/cvtsudoers_merge.c:661
 #: plugins/sudoers/cvtsudoers_merge.c:664
 #: plugins/sudoers/cvtsudoers_merge.c:1196
-#: plugins/sudoers/cvtsudoers_merge.c:1281 plugins/sudoers/defaults.c:455
-#: plugins/sudoers/defaults.c:690 plugins/sudoers/defaults.c:1062
-#: plugins/sudoers/defaults.c:1248 plugins/sudoers/editor.c:198
+#: plugins/sudoers/cvtsudoers_merge.c:1281 plugins/sudoers/defaults.c:457
+#: plugins/sudoers/defaults.c:692 plugins/sudoers/defaults.c:1064
+#: plugins/sudoers/defaults.c:1250 plugins/sudoers/editor.c:198
 #: plugins/sudoers/env.c:280 plugins/sudoers/exptilde.c:92
 #: plugins/sudoers/filedigest.c:66 plugins/sudoers/filedigest.c:70
 #: plugins/sudoers/gc.c:57 plugins/sudoers/group_plugin.c:211
@@ -350,9 +360,9 @@ msgstr ""
 #: plugins/sudoers/iolog.c:683 plugins/sudoers/iolog.c:711
 #: plugins/sudoers/ldap.c:161 plugins/sudoers/ldap.c:448
 #: plugins/sudoers/ldap.c:625 plugins/sudoers/ldap.c:789
-#: plugins/sudoers/ldap.c:1214 plugins/sudoers/ldap.c:1642
-#: plugins/sudoers/ldap.c:1679 plugins/sudoers/ldap.c:1897
-#: plugins/sudoers/ldap.c:2007 plugins/sudoers/ldap.c:2023
+#: plugins/sudoers/ldap.c:1214 plugins/sudoers/ldap.c:1648
+#: plugins/sudoers/ldap.c:1685 plugins/sudoers/ldap.c:1903
+#: plugins/sudoers/ldap.c:2013 plugins/sudoers/ldap.c:2029
 #: plugins/sudoers/ldap_conf.c:215 plugins/sudoers/ldap_conf.c:247
 #: plugins/sudoers/ldap_conf.c:299 plugins/sudoers/ldap_conf.c:335
 #: plugins/sudoers/ldap_conf.c:441 plugins/sudoers/ldap_conf.c:456
@@ -365,12 +375,12 @@ msgstr ""
 #: plugins/sudoers/log_client.c:411 plugins/sudoers/log_client.c:726
 #: plugins/sudoers/log_client.c:748 plugins/sudoers/log_client.c:753
 #: plugins/sudoers/log_client.c:1449 plugins/sudoers/log_client.c:1570
-#: plugins/sudoers/log_client.c:1693 plugins/sudoers/log_client.c:2018
-#: plugins/sudoers/log_client.c:2077 plugins/sudoers/logging.c:110
+#: plugins/sudoers/log_client.c:1693 plugins/sudoers/log_client.c:2025
+#: plugins/sudoers/log_client.c:2084 plugins/sudoers/logging.c:110
 #: plugins/sudoers/logging.c:189 plugins/sudoers/logging.c:190
-#: plugins/sudoers/logging.c:483 plugins/sudoers/logging.c:723
-#: plugins/sudoers/logging.c:763 plugins/sudoers/logging.c:880
-#: plugins/sudoers/logging.c:933 plugins/sudoers/logging.c:940
+#: plugins/sudoers/logging.c:485 plugins/sudoers/logging.c:733
+#: plugins/sudoers/logging.c:773 plugins/sudoers/logging.c:890
+#: plugins/sudoers/logging.c:943 plugins/sudoers/logging.c:950
 #: plugins/sudoers/lookup.c:330 plugins/sudoers/lookup.c:347
 #: plugins/sudoers/lookup.c:365 plugins/sudoers/lookup.c:383
 #: plugins/sudoers/lookup.c:400 plugins/sudoers/lookup.c:422
@@ -393,11 +403,11 @@ msgstr ""
 #: plugins/sudoers/policy.c:373 plugins/sudoers/policy.c:375
 #: plugins/sudoers/policy.c:414 plugins/sudoers/policy.c:423
 #: plugins/sudoers/policy.c:432 plugins/sudoers/policy.c:441
-#: plugins/sudoers/policy.c:492 plugins/sudoers/policy.c:501
-#: plugins/sudoers/policy.c:510 plugins/sudoers/policy.c:519
-#: plugins/sudoers/policy.c:528 plugins/sudoers/policy.c:537
-#: plugins/sudoers/policy.c:546 plugins/sudoers/policy.c:654
-#: plugins/sudoers/policy.c:1071 plugins/sudoers/prompt.c:94
+#: plugins/sudoers/policy.c:495 plugins/sudoers/policy.c:504
+#: plugins/sudoers/policy.c:513 plugins/sudoers/policy.c:522
+#: plugins/sudoers/policy.c:531 plugins/sudoers/policy.c:540
+#: plugins/sudoers/policy.c:549 plugins/sudoers/policy.c:657
+#: plugins/sudoers/policy.c:1074 plugins/sudoers/prompt.c:94
 #: plugins/sudoers/pwutil.c:219 plugins/sudoers/pwutil.c:290
 #: plugins/sudoers/pwutil.c:368 plugins/sudoers/pwutil.c:542
 #: plugins/sudoers/pwutil.c:607 plugins/sudoers/pwutil.c:679
@@ -424,15 +434,15 @@ msgstr ""
 #: plugins/sudoers/testsudoers.c:282 plugins/sudoers/testsudoers.c:302
 #: plugins/sudoers/testsudoers.c:756 plugins/sudoers/timestamp.c:468
 #: plugins/sudoers/timestamp.c:514 plugins/sudoers/timestamp.c:1045
-#: plugins/sudoers/timestamp.c:1248 plugins/sudoers/toke_util.c:79
-#: plugins/sudoers/toke_util.c:108 plugins/sudoers/toke_util.c:134
-#: plugins/sudoers/toke_util.c:163 plugins/sudoers/toke_util.c:204
+#: plugins/sudoers/timestamp.c:1248 plugins/sudoers/toke_util.c:80
+#: plugins/sudoers/toke_util.c:109 plugins/sudoers/toke_util.c:135
+#: plugins/sudoers/toke_util.c:164 plugins/sudoers/toke_util.c:205
 #: plugins/sudoers/tsdump.c:136 plugins/sudoers/visudo.c:151
 #: plugins/sudoers/visudo.c:258 plugins/sudoers/visudo.c:383
 #: plugins/sudoers/visudo.c:389 plugins/sudoers/visudo.c:501
 #: plugins/sudoers/visudo.c:1073 plugins/sudoers/visudo.c:1094
 #: plugins/sudoers/visudo.c:1189 toke.l:1011 toke.l:1174 toke.l:1193
-#: toke.l:1220 toke.l:1289 toke.l:1300
+#: toke.l:1221 toke.l:1290 toke.l:1301
 #, c-format
 msgid "%s: %s"
 msgstr ""
@@ -545,7 +555,7 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: lib/iolog/iolog_filter.c:133 plugins/sudoers/defaults.c:1303
+#: lib/iolog/iolog_filter.c:133 plugins/sudoers/defaults.c:1305
 #: plugins/sudoers/sudoreplay.c:1293 plugins/sudoers/sudoreplay.c:1589
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
@@ -587,7 +597,7 @@ msgid "%s exists but is not a directory (0%o)"
 msgstr ""
 
 #: lib/iolog/iolog_mkdirs.c:125 lib/iolog/iolog_mkdtemp.c:80
-#: logsrvd/iolog_writer.c:803 plugins/sudoers/timestamp.c:218
+#: logsrvd/iolog_writer.c:831 plugins/sudoers/timestamp.c:218
 #, c-format
 msgid "unable to mkdir %s"
 msgstr ""
@@ -625,67 +635,67 @@ msgstr ""
 msgid "%s: protocol error: NULL value found in %s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:141 plugins/sudoers/logging.c:1035
-#: plugins/sudoers/policy.c:621
+#: logsrvd/iolog_writer.c:155 plugins/sudoers/logging.c:1045
+#: plugins/sudoers/policy.c:624
 msgid "unable to generate UUID"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:362 logsrvd/iolog_writer.c:367
-#: logsrvd/iolog_writer.c:372 logsrvd/iolog_writer.c:377
+#: logsrvd/iolog_writer.c:390 logsrvd/iolog_writer.c:395
+#: logsrvd/iolog_writer.c:400 logsrvd/iolog_writer.c:405
 #, c-format
 msgid "%s: protocol error: %s missing from AcceptMessage"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:438
+#: logsrvd/iolog_writer.c:466
 #, c-format
 msgid "%s: unable to format session id"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:452 logsrvd/iolog_writer.c:466
-#: logsrvd/iolog_writer.c:480 logsrvd/iolog_writer.c:495
-#: logsrvd/iolog_writer.c:509 logsrvd/iolog_writer.c:523
+#: logsrvd/iolog_writer.c:480 logsrvd/iolog_writer.c:494
+#: logsrvd/iolog_writer.c:508 logsrvd/iolog_writer.c:523
+#: logsrvd/iolog_writer.c:537 logsrvd/iolog_writer.c:551
 #, c-format
 msgid "%s: %s is not set"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:559 logsrvd/iolog_writer.c:566
+#: logsrvd/iolog_writer.c:587 logsrvd/iolog_writer.c:594
 #, c-format
 msgid "unable to expand iolog path %s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:584
+#: logsrvd/iolog_writer.c:612
 #, c-format
 msgid "unable to create iolog path %s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:614
+#: logsrvd/iolog_writer.c:642
 #, c-format
 msgid "invalid iofd %d"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:634
+#: logsrvd/iolog_writer.c:662
 #, c-format
 msgid "error closing iofd %u: %s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:655
+#: logsrvd/iolog_writer.c:683
 #, c-format
 msgid "error flushing iofd %u: %s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:773
+#: logsrvd/iolog_writer.c:801
 #, c-format
 msgid "invalid I/O log %s: %s referenced but not present"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:785 logsrvd/logsrvd_journal.c:391
+#: logsrvd/iolog_writer.c:813 logsrvd/logsrvd_journal.c:391
 #, c-format
 msgid "%s: unable to find resume point [%lld, %ld]"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:807 logsrvd/logsrvd_journal.c:434
+#: logsrvd/iolog_writer.c:835 logsrvd/logsrvd_journal.c:434
 #: logsrvd/logsrvd_queue.c:115 logsrvd/tls_init.c:256
-#: plugins/sudoers/check.c:278 plugins/sudoers/cvtsudoers.c:758
+#: plugins/sudoers/check.c:287 plugins/sudoers/cvtsudoers.c:758
 #: plugins/sudoers/cvtsudoers.c:780 plugins/sudoers/cvtsudoers.c:1457
 #: plugins/sudoers/cvtsudoers_csv.c:722 plugins/sudoers/cvtsudoers_json.c:1034
 #: plugins/sudoers/cvtsudoers_ldif.c:753 plugins/sudoers/sudoers.c:1309
@@ -696,19 +706,19 @@ msgstr ""
 msgid "unable to open %s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:819 logsrvd/logsrv_util.c:111
+#: logsrvd/iolog_writer.c:847 logsrvd/logsrv_util.c:111
 #: logsrvd/logsrv_util.c:118 plugins/sudoers/sudoreplay.c:355
 #: plugins/sudoers/sudoreplay.c:361
 #, c-format
 msgid "unable to open %s/%s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:832
+#: logsrvd/iolog_writer.c:860
 #, c-format
 msgid "unable to copy %s/%s to %s/%s: %s"
 msgstr ""
 
-#: logsrvd/iolog_writer.c:861 logsrvd/logsrvd_journal.c:198
+#: logsrvd/iolog_writer.c:889 logsrvd/logsrvd_journal.c:198
 #, c-format
 msgid "unable to rename %s to %s"
 msgstr ""
@@ -732,20 +742,20 @@ msgstr ""
 msgid "unable to connect to relay"
 msgstr ""
 
-#: logsrvd/logsrvd.c:339 logsrvd/logsrvd_relay.c:847
+#: logsrvd/logsrvd.c:339 logsrvd/logsrvd_relay.c:853
 #, c-format
 msgid "server message too large: %zu"
 msgstr ""
 
 #: logsrvd/logsrvd.c:431 logsrvd/logsrvd.c:554 logsrvd/logsrvd.c:640
-#: logsrvd/logsrvd.c:882 logsrvd/logsrvd.c:896 logsrvd/logsrvd.c:1057
-#: logsrvd/logsrvd.c:1182 logsrvd/logsrvd.c:1364 logsrvd/logsrvd.c:1382
-#: logsrvd/logsrvd.c:1481 logsrvd/logsrvd.c:1606 logsrvd/logsrvd.c:1793
-#: logsrvd/logsrvd_journal.c:503 logsrvd/logsrvd_local.c:238
+#: logsrvd/logsrvd.c:882 logsrvd/logsrvd.c:896 logsrvd/logsrvd.c:1061
+#: logsrvd/logsrvd.c:1189 logsrvd/logsrvd.c:1371 logsrvd/logsrvd.c:1389
+#: logsrvd/logsrvd.c:1488 logsrvd/logsrvd.c:1613 logsrvd/logsrvd.c:1800
+#: logsrvd/logsrvd_journal.c:503 logsrvd/logsrvd_local.c:239
 #: logsrvd/logsrvd_queue.c:164 logsrvd/logsrvd_relay.c:172
 #: logsrvd/logsrvd_relay.c:249 logsrvd/logsrvd_relay.c:253
 #: logsrvd/logsrvd_relay.c:391 logsrvd/logsrvd_relay.c:583
-#: logsrvd/logsrvd_relay.c:747 logsrvd/logsrvd_relay.c:1137
+#: logsrvd/logsrvd_relay.c:747 logsrvd/logsrvd_relay.c:1149
 #: logsrvd/sendlog.c:1333 logsrvd/tls_client.c:145 logsrvd/tls_client.c:161
 #: logsrvd/tls_client.c:225 plugins/sudoers/audit.c:281
 #: plugins/sudoers/iolog.c:1049 plugins/sudoers/iolog.c:1183
@@ -755,8 +765,8 @@ msgstr ""
 #: plugins/sudoers/log_client.c:629 plugins/sudoers/log_client.c:1137
 #: plugins/sudoers/log_client.c:1418 plugins/sudoers/log_client.c:1459
 #: plugins/sudoers/log_client.c:1467 plugins/sudoers/log_client.c:1626
-#: plugins/sudoers/log_client.c:1751 plugins/sudoers/log_client.c:2085
-#: plugins/sudoers/log_client.c:2093 plugins/sudoers/logging.c:148
+#: plugins/sudoers/log_client.c:1751 plugins/sudoers/log_client.c:2092
+#: plugins/sudoers/log_client.c:2100 plugins/sudoers/logging.c:148
 #: plugins/sudoers/logging.c:206 plugins/sudoers/sudoreplay.c:519
 #: plugins/sudoers/sudoreplay.c:566 plugins/sudoers/sudoreplay.c:810
 #: plugins/sudoers/sudoreplay.c:922 plugins/sudoers/sudoreplay.c:1013
@@ -844,93 +854,115 @@ msgstr ""
 msgid "timed out writing to client %s"
 msgstr ""
 
-#: logsrvd/logsrvd.c:933 logsrvd/logsrvd_relay.c:919 logsrvd/sendlog.c:1438
+#: logsrvd/logsrvd.c:933 logsrvd/logsrvd_relay.c:925 logsrvd/sendlog.c:1443
 #, c-format
 msgid "missing write buffer for client %s"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1028
+#: logsrvd/logsrvd.c:982 logsrvd/logsrvd.c:1109 logsrvd/logsrvd_relay.c:841
+#: logsrvd/logsrvd_relay.c:999 logsrvd/sendlog.c:1393 logsrvd/sendlog.c:1514
+#: plugins/sudoers/cvtsudoers_csv.c:192 plugins/sudoers/cvtsudoers_csv.c:199
+#: plugins/sudoers/cvtsudoers_ldif.c:270 plugins/sudoers/cvtsudoers_ldif.c:277
+#: plugins/sudoers/cvtsudoers_ldif.c:628 plugins/sudoers/env.c:357
+#: plugins/sudoers/env.c:364 plugins/sudoers/env.c:475
+#: plugins/sudoers/ldap.c:511 plugins/sudoers/ldap.c:629
+#: plugins/sudoers/ldap.c:1003 plugins/sudoers/ldap.c:1301
+#: plugins/sudoers/ldap_conf.c:219 plugins/sudoers/ldap_conf.c:310
+#: plugins/sudoers/ldap_util.c:483 plugins/sudoers/linux_audit.c:93
+#: plugins/sudoers/log_client.c:1810 plugins/sudoers/log_client.c:1942
+#: plugins/sudoers/logging.c:489 plugins/sudoers/policy.c:839
+#: plugins/sudoers/policy.c:851 plugins/sudoers/prompt.c:169
+#: plugins/sudoers/serialize_list.c:62 plugins/sudoers/serialize_list.c:71
+#: plugins/sudoers/strvec_join.c:62 plugins/sudoers/sudoreplay.c:1342
+#: plugins/sudoers/sudoreplay.c:1348 plugins/sudoers/sudoreplay.c:1354
+#: plugins/sudoers/testsudoers.c:306 plugins/sudoers/toke_util.c:218 toke.l:975
+#: toke.l:1258
+#, c-format
+msgid "internal error, %s overflow"
+msgstr ""
+
+#: logsrvd/logsrvd.c:1032
 #, c-format
 msgid "timed out reading from client %s"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1069 logsrvd/logsrvd_relay.c:782
+#: logsrvd/logsrvd.c:1073 logsrvd/logsrvd_relay.c:782
 #, c-format
 msgid "EOF from %s without proper TLS shutdown"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1113 logsrvd/logsrvd_relay.c:205 logsrvd/sendlog.c:336
+#: logsrvd/logsrvd.c:1120 logsrvd/logsrvd_relay.c:205 logsrvd/sendlog.c:336
 #: plugins/sudoers/log_client.c:732
 #, c-format
 msgid "client message too large: %zu"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1114 logsrvd/logsrvd_journal.c:259
+#: logsrvd/logsrvd.c:1121 logsrvd/logsrvd_journal.c:259
 #: logsrvd/logsrvd_journal.c:260
 msgid "client message too large"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1132 logsrvd/logsrvd.c:1133
+#: logsrvd/logsrvd.c:1139 logsrvd/logsrvd.c:1140
 msgid "invalid ClientMessage"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1442
+#: logsrvd/logsrvd.c:1449
 msgid "unable to get remote IP addr"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1473 logsrvd/tls_client.c:212
+#: logsrvd/logsrvd.c:1480 logsrvd/tls_client.c:212
 #: plugins/sudoers/log_client.c:290
 #, c-format
 msgid "Unable to attach user data to the ssl object: %s"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1656 logsrvd/logsrvd.c:2050
+#: logsrvd/logsrvd.c:1663 logsrvd/logsrvd.c:2057
 msgid "unable to setup listen socket"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1776
+#: logsrvd/logsrvd.c:1783
 #, c-format
 msgid "unexpected signal %d"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1949
+#: logsrvd/logsrvd.c:1956
 msgid "sudo log server"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1951 logsrvd/sendlog.c:126
+#: logsrvd/logsrvd.c:1958 logsrvd/sendlog.c:126
 msgid "Options:"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1953
+#: logsrvd/logsrvd.c:1960
 msgid "path to configuration file"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1955 logsrvd/sendlog.c:128
+#: logsrvd/logsrvd.c:1962 logsrvd/sendlog.c:128
 msgid "display help message and exit"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1957
+#: logsrvd/logsrvd.c:1964
 msgid "do not fork, run in the foreground"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1959
+#: logsrvd/logsrvd.c:1966
 msgid "percent chance connections will drop"
 msgstr ""
 
-#: logsrvd/logsrvd.c:1961 logsrvd/sendlog.c:158
+#: logsrvd/logsrvd.c:1968 logsrvd/sendlog.c:158
 msgid "display version information and exit"
 msgstr ""
 
-#: logsrvd/logsrvd.c:2011 logsrvd/sendlog.c:1747
+#: logsrvd/logsrvd.c:2018 logsrvd/sendlog.c:1757
 msgid "Protobuf-C version 1.3 or higher required"
 msgstr ""
 
-#: logsrvd/logsrvd.c:2027
+#: logsrvd/logsrvd.c:2034
 #, c-format
 msgid "invalid random drop value: %s"
 msgstr ""
 
-#: logsrvd/logsrvd.c:2030 logsrvd/sendlog.c:1801
+#: logsrvd/logsrvd.c:2037 logsrvd/sendlog.c:1811
 #: plugins/sudoers/cvtsudoers.c:250 plugins/sudoers/sudoreplay.c:294
 #: plugins/sudoers/visudo.c:181
 #, c-format
@@ -1022,7 +1054,7 @@ msgid "%s:%d [%s] illegal key: %s"
 msgstr ""
 
 #: logsrvd/logsrvd_conf.c:1286 plugins/sudoers/cvtsudoers.c:273
-#: plugins/sudoers/logging.c:1087
+#: plugins/sudoers/logging.c:1097
 #, c-format
 msgid "unable to open log file %s"
 msgstr ""
@@ -1095,64 +1127,64 @@ msgstr ""
 msgid "error creating I/O log"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:228
+#: logsrvd/logsrvd_local.c:229
 msgid "error logging accept event"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:267
+#: logsrvd/logsrvd_local.c:268
 msgid "error parsing RejectMessage"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:291
+#: logsrvd/logsrvd_local.c:293
 msgid "error logging reject event"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:427 logsrvd/logsrvd_local.c:437
+#: logsrvd/logsrvd_local.c:430 logsrvd/logsrvd_local.c:440
 msgid "error logging exit event"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:494 logsrvd/logsrvd_local.c:495
+#: logsrvd/logsrvd_local.c:497 logsrvd/logsrvd_local.c:498
 msgid "log is already complete, cannot be restarted"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:525
+#: logsrvd/logsrvd_local.c:528
 msgid "unable to restart log"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:541
+#: logsrvd/logsrvd_local.c:544
 msgid "error parsing AlertMessage"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:551
+#: logsrvd/logsrvd_local.c:554
 msgid "error logging alert event"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:587 logsrvd/logsrvd_local.c:650
-#: logsrvd/logsrvd_local.c:685
+#: logsrvd/logsrvd_local.c:590 logsrvd/logsrvd_local.c:653
+#: logsrvd/logsrvd_local.c:688
 #, c-format
 msgid "unable to format timing buffer, length %d"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:601 logsrvd/logsrvd_local.c:609
-#: logsrvd/logsrvd_local.c:657 logsrvd/logsrvd_local.c:692
+#: logsrvd/logsrvd_local.c:604 logsrvd/logsrvd_local.c:612
+#: logsrvd/logsrvd_local.c:660 logsrvd/logsrvd_local.c:695
 #: plugins/sudoers/sudoreplay.c:344 toke.l:961 toke.l:964
 #, c-format
 msgid "%s/%s: %s"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:620
+#: logsrvd/logsrvd_local.c:623
 msgid "randomly dropping connection"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:632
+#: logsrvd/logsrvd_local.c:635
 msgid "error writing IoBuffer"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:667
+#: logsrvd/logsrvd_local.c:670
 msgid "error writing ChangeWindowSize"
 msgstr ""
 
-#: logsrvd/logsrvd_local.c:702
+#: logsrvd/logsrvd_local.c:705
 msgid "error writing CommandSuspend"
 msgstr ""
 
@@ -1192,33 +1224,30 @@ msgid "relay host name does not match certificate"
 msgstr ""
 
 #: logsrvd/logsrvd_relay.c:773 logsrvd/logsrvd_relay.c:787
-#: logsrvd/logsrvd_relay.c:794
+#: logsrvd/logsrvd_relay.c:794 logsrvd/logsrvd_relay.c:811
+#: logsrvd/logsrvd_relay.c:842
 msgid "error reading from relay"
 msgstr ""
 
-#: logsrvd/logsrvd_relay.c:815
-msgid "unable to read from relay"
-msgstr ""
-
-#: logsrvd/logsrvd_relay.c:830 logsrvd/logsrvd_relay.c:949
+#: logsrvd/logsrvd_relay.c:833 logsrvd/logsrvd_relay.c:955
 msgid "relay server closed connection"
 msgstr ""
 
-#: logsrvd/logsrvd_relay.c:848
+#: logsrvd/logsrvd_relay.c:854
 msgid "server message too large"
 msgstr ""
 
-#: logsrvd/logsrvd_relay.c:912
+#: logsrvd/logsrvd_relay.c:918
 #, c-format
 msgid "timed out writing to relay %s (%s)"
 msgstr ""
 
-#: logsrvd/logsrvd_relay.c:914
+#: logsrvd/logsrvd_relay.c:920
 msgid "timeout writing to relay"
 msgstr ""
 
-#: logsrvd/logsrvd_relay.c:968 logsrvd/logsrvd_relay.c:975
-#: logsrvd/logsrvd_relay.c:987
+#: logsrvd/logsrvd_relay.c:974 logsrvd/logsrvd_relay.c:981
+#: logsrvd/logsrvd_relay.c:993 logsrvd/logsrvd_relay.c:1000
 msgid "error writing to relay"
 msgstr ""
 
@@ -1324,38 +1353,38 @@ msgstr ""
 msgid "host name does not match certificate"
 msgstr ""
 
-#: logsrvd/sendlog.c:1386
+#: logsrvd/sendlog.c:1389
 msgid "premature EOF"
 msgstr ""
 
-#: logsrvd/sendlog.c:1399 plugins/sudoers/log_client.c:1818
+#: logsrvd/sendlog.c:1404 plugins/sudoers/log_client.c:1821
 #, c-format
 msgid "server message too large: %u"
 msgstr ""
 
-#: logsrvd/sendlog.c:1455
+#: logsrvd/sendlog.c:1460
 msgid "timeout writing to server"
 msgstr ""
 
-#: logsrvd/sendlog.c:1825
+#: logsrvd/sendlog.c:1835
 msgid "both restart point and iolog ID must be specified"
 msgstr ""
 
-#: logsrvd/sendlog.c:1829
+#: logsrvd/sendlog.c:1839
 msgid "a restart point may not be set when no I/O is sent"
 msgstr ""
 
-#: logsrvd/sendlog.c:1905
+#: logsrvd/sendlog.c:1915
 #, c-format
 msgid "exited prematurely with state %d"
 msgstr ""
 
-#: logsrvd/sendlog.c:1906
+#: logsrvd/sendlog.c:1916
 #, c-format
 msgid "elapsed time sent to server [%lld, %ld]"
 msgstr ""
 
-#: logsrvd/sendlog.c:1908
+#: logsrvd/sendlog.c:1918
 #, c-format
 msgid "commit point received from server [%lld, %ld]"
 msgstr ""
@@ -1415,9 +1444,9 @@ msgstr ""
 
 #: plugins/sudoers/audit.c:272 plugins/sudoers/log_client.c:985
 #: plugins/sudoers/log_client.c:1034 plugins/sudoers/log_client.c:1083
-#: plugins/sudoers/log_client.c:1208 plugins/sudoers/logging.c:627
-#: plugins/sudoers/logging.c:867 plugins/sudoers/logging.c:1017
-#: plugins/sudoers/logging.c:1041 plugins/sudoers/policy.c:1055
+#: plugins/sudoers/log_client.c:1208 plugins/sudoers/logging.c:632
+#: plugins/sudoers/logging.c:877 plugins/sudoers/logging.c:1027
+#: plugins/sudoers/logging.c:1051 plugins/sudoers/policy.c:1058
 msgid "unable to get time of day"
 msgstr ""
 
@@ -1521,35 +1550,35 @@ msgstr ""
 msgid "unable to initialize PAM: %s"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:349
+#: plugins/sudoers/auth/pam.c:359
 #, c-format
 msgid "PAM authentication error: %s"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:369
+#: plugins/sudoers/auth/pam.c:380
 msgid "account validation failure, is your account locked?"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:380
+#: plugins/sudoers/auth/pam.c:391
 msgid "Account or password is expired, reset your password and try again"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:387
+#: plugins/sudoers/auth/pam.c:398
 #, c-format
 msgid "unable to change expired password: %s"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:398
+#: plugins/sudoers/auth/pam.c:409
 msgid "Password expired, contact your system administrator"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:403
+#: plugins/sudoers/auth/pam.c:414
 msgid ""
 "Account expired or PAM config lacks an \"account\" section for sudo, contact "
 "your system administrator"
 msgstr ""
 
-#: plugins/sudoers/auth/pam.c:411 plugins/sudoers/auth/pam.c:416
+#: plugins/sudoers/auth/pam.c:422 plugins/sudoers/auth/pam.c:427
 #, c-format
 msgid "PAM account management error: %s"
 msgstr ""
@@ -1637,17 +1666,17 @@ msgstr ""
 msgid "unknown uid %u"
 msgstr ""
 
-#: plugins/sudoers/check.c:270
+#: plugins/sudoers/check.c:279
 #, c-format
 msgid "error reading lecture file %s"
 msgstr ""
 
-#: plugins/sudoers/check.c:273
+#: plugins/sudoers/check.c:282
 #, c-format
 msgid "ignoring lecture file %s: not a regular file"
 msgstr ""
 
-#: plugins/sudoers/check.c:286
+#: plugins/sudoers/check.c:295
 msgid ""
 "\n"
 "We trust you have received the usual lecture from the local System\n"
@@ -1659,17 +1688,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/sudoers/check.c:294
+#: plugins/sudoers/check.c:303
 msgid ""
 "For security reasons, the password you type will not be visible.\n"
 "\n"
 msgstr ""
 
-#: plugins/sudoers/check_aliases.c:93
-#, c-format
-msgid "cycle in %s \"%s\""
-msgstr ""
-
 #: plugins/sudoers/check_aliases.c:96
 #, c-format
 msgid "%s \"%s\" referenced but not defined"
@@ -1781,24 +1805,6 @@ msgid ""
 "  -V, --version              display version information and exit"
 msgstr ""
 
-#: plugins/sudoers/cvtsudoers_csv.c:192 plugins/sudoers/cvtsudoers_csv.c:199
-#: plugins/sudoers/cvtsudoers_ldif.c:270 plugins/sudoers/cvtsudoers_ldif.c:277
-#: plugins/sudoers/cvtsudoers_ldif.c:628 plugins/sudoers/env.c:357
-#: plugins/sudoers/env.c:364 plugins/sudoers/env.c:475
-#: plugins/sudoers/ldap.c:511 plugins/sudoers/ldap.c:629
-#: plugins/sudoers/ldap.c:1003 plugins/sudoers/ldap_conf.c:219
-#: plugins/sudoers/ldap_conf.c:310 plugins/sudoers/ldap_util.c:483
-#: plugins/sudoers/linux_audit.c:93 plugins/sudoers/logging.c:487
-#: plugins/sudoers/policy.c:836 plugins/sudoers/policy.c:848
-#: plugins/sudoers/prompt.c:169 plugins/sudoers/serialize_list.c:62
-#: plugins/sudoers/serialize_list.c:71 plugins/sudoers/strvec_join.c:62
-#: plugins/sudoers/sudoreplay.c:1342 plugins/sudoers/sudoreplay.c:1348
-#: plugins/sudoers/sudoreplay.c:1354 plugins/sudoers/testsudoers.c:306
-#: plugins/sudoers/toke_util.c:217 toke.l:975 toke.l:1257
-#, c-format
-msgid "internal error, %s overflow"
-msgstr ""
-
 #: plugins/sudoers/cvtsudoers_csv.c:481 plugins/sudoers/cvtsudoers_csv.c:495
 #: plugins/sudoers/cvtsudoers_json.c:760 plugins/sudoers/cvtsudoers_json.c:776
 #: plugins/sudoers/cvtsudoers_ldif.c:384 plugins/sudoers/cvtsudoers_ldif.c:398
@@ -2034,12 +2040,12 @@ msgstr ""
 
 #: plugins/sudoers/def_data.c:194
 #, c-format
-msgid "Authentication timestamp timeout: %.1f minutes"
+msgid "Authentication timestamp timeout: %d.%d minutes"
 msgstr ""
 
 #: plugins/sudoers/def_data.c:198
 #, c-format
-msgid "Password prompt timeout: %.1f minutes"
+msgid "Password prompt timeout: %d.%d minutes"
 msgstr ""
 
 #: plugins/sudoers/def_data.c:202
@@ -2628,48 +2634,48 @@ msgstr ""
 msgid "Command denial message: %s"
 msgstr ""
 
-#: plugins/sudoers/defaults.c:207
+#: plugins/sudoers/defaults.c:209
 #, c-format
 msgid "unknown defaults entry \"%s\""
 msgstr ""
 
-#: plugins/sudoers/defaults.c:251
+#: plugins/sudoers/defaults.c:253
 #, c-format
 msgid "no value specified for \"%s\""
 msgstr ""
 
-#: plugins/sudoers/defaults.c:260
+#: plugins/sudoers/defaults.c:262
 #, c-format
 msgid "invalid operator \"%c=\" for \"%s\""
 msgstr ""
 
-#: plugins/sudoers/defaults.c:292
+#: plugins/sudoers/defaults.c:294
 #, c-format
 msgid "option \"%s\" does not take a value"
 msgstr ""
 
-#: plugins/sudoers/defaults.c:319
+#: plugins/sudoers/defaults.c:321
 #, c-format
 msgid "invalid Defaults type 0x%x for option \"%s\""
 msgstr ""
 
-#: plugins/sudoers/defaults.c:326
+#: plugins/sudoers/defaults.c:328
 #, c-format
 msgid "value \"%s\" is invalid for option \"%s\""
 msgstr ""
 
-#: plugins/sudoers/defaults.c:1189 plugins/sudoers/policy.c:208
+#: plugins/sudoers/defaults.c:1191 plugins/sudoers/policy.c:208
 #: plugins/sudoers/policy.c:217
 #, c-format
 msgid "path name for \"%s\" too long"
 msgstr ""
 
-#: plugins/sudoers/defaults.c:1195
+#: plugins/sudoers/defaults.c:1197
 #, c-format
 msgid "values for \"%s\" must start with a '/', '~', or '*'"
 msgstr ""
 
-#: plugins/sudoers/defaults.c:1202
+#: plugins/sudoers/defaults.c:1204
 #, c-format
 msgid "values for \"%s\" must start with a '/'"
 msgstr ""
@@ -2733,11 +2739,11 @@ msgstr ""
 msgid "sudo_putenv: corrupted envp, length mismatch"
 msgstr ""
 
-#: plugins/sudoers/env.c:1137
+#: plugins/sudoers/env.c:1139
 msgid "unable to rebuild the environment"
 msgstr ""
 
-#: plugins/sudoers/env.c:1217
+#: plugins/sudoers/env.c:1219
 #, c-format
 msgid ""
 "sorry, you are not allowed to set the following environment variables: %s"
@@ -2831,18 +2837,18 @@ msgstr ""
 msgid "you must set TLS_CERT in %s to use SSL"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1593
+#: plugins/sudoers/ldap.c:1599
 #, c-format
 msgid "unable to initialize LDAP: %s"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1630
+#: plugins/sudoers/ldap.c:1636
 msgid ""
 "start_tls specified but LDAP libs do not support ldap_start_tls_s() or "
 "ldap_start_tls_s_np()"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1767 plugins/sudoers/parse_ldif.c:745
+#: plugins/sudoers/ldap.c:1773 plugins/sudoers/parse_ldif.c:745
 #, c-format
 msgid "invalid sudoOrder attribute: %s"
 msgstr ""
@@ -2883,7 +2889,7 @@ msgid "unable to send audit message"
 msgstr ""
 
 #: plugins/sudoers/log_client.c:125 plugins/sudoers/log_client.c:421
-#: plugins/sudoers/log_client.c:1473 plugins/sudoers/log_client.c:2101
+#: plugins/sudoers/log_client.c:1473 plugins/sudoers/log_client.c:2108
 msgid "error in event loop"
 msgstr ""
 
@@ -2930,15 +2936,15 @@ msgstr ""
 msgid "%s: internal error, invalid exit status %d"
 msgstr ""
 
-#: plugins/sudoers/log_client.c:1780 plugins/sudoers/log_client.c:1805
+#: plugins/sudoers/log_client.c:1780 plugins/sudoers/log_client.c:1806
 msgid "lost connection to log server"
 msgstr ""
 
-#: plugins/sudoers/log_client.c:1882
+#: plugins/sudoers/log_client.c:1885
 msgid "missing write buffer"
 msgstr ""
 
-#: plugins/sudoers/log_client.c:2040
+#: plugins/sudoers/log_client.c:2047
 msgid "unable to connect to log server"
 msgstr ""
 
@@ -2991,7 +2997,7 @@ msgstr ""
 msgid "This incident has been reported to the administrator.\n"
 msgstr ""
 
-#: plugins/sudoers/logging.c:395 plugins/sudoers/sudoers.c:564
+#: plugins/sudoers/logging.c:397 plugins/sudoers/sudoers.c:564
 #: plugins/sudoers/sudoers.c:566 plugins/sudoers/sudoers.c:568
 #: plugins/sudoers/sudoers.c:570 plugins/sudoers/sudoers.c:794
 #: plugins/sudoers/sudoers.c:796
@@ -2999,38 +3005,38 @@ msgstr ""
 msgid "%s: command not found"
 msgstr ""
 
-#: plugins/sudoers/logging.c:397 plugins/sudoers/sudoers.c:560
+#: plugins/sudoers/logging.c:399 plugins/sudoers/sudoers.c:560
 #, c-format
 msgid ""
 "ignoring \"%s\" found in '.'\n"
 "Use \"sudo ./%s\" if this is the \"%s\" you wish to run."
 msgstr ""
 
-#: plugins/sudoers/logging.c:417
+#: plugins/sudoers/logging.c:419
 #, c-format
 msgid "%u incorrect password attempt"
 msgid_plural "%u incorrect password attempts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/sudoers/logging.c:508
+#: plugins/sudoers/logging.c:510
 msgid "authentication failure"
 msgstr ""
 
-#: plugins/sudoers/logging.c:552 plugins/sudoers/logging.c:571
+#: plugins/sudoers/logging.c:557 plugins/sudoers/logging.c:576
 msgid "a password is required"
 msgstr ""
 
-#: plugins/sudoers/logging.c:889
+#: plugins/sudoers/logging.c:899
 msgid "problem parsing sudoers"
 msgstr ""
 
-#: plugins/sudoers/logging.c:930 plugins/sudoers/logging.c:938
+#: plugins/sudoers/logging.c:940 plugins/sudoers/logging.c:948
 #, c-format
 msgid "%s:%d:%d: %s"
 msgstr ""
 
-#: plugins/sudoers/logging.c:1119
+#: plugins/sudoers/logging.c:1129
 #, c-format
 msgid "unable to write log file %s"
 msgstr ""
@@ -3077,82 +3083,82 @@ msgstr ""
 msgid "unable to parse network address list"
 msgstr ""
 
-#: plugins/sudoers/policy.c:555
+#: plugins/sudoers/policy.c:558
 msgid "user name not set by sudo front-end"
 msgstr ""
 
-#: plugins/sudoers/policy.c:559
+#: plugins/sudoers/policy.c:562
 msgid "user-ID not set by sudo front-end"
 msgstr ""
 
-#: plugins/sudoers/policy.c:563
+#: plugins/sudoers/policy.c:566
 msgid "group-ID not set by sudo front-end"
 msgstr ""
 
-#: plugins/sudoers/policy.c:567
+#: plugins/sudoers/policy.c:570
 msgid "host name not set by sudo front-end"
 msgstr ""
 
-#: plugins/sudoers/policy.c:765
+#: plugins/sudoers/policy.c:768
 #, c-format
 msgid "invalid working directory: %s"
 msgstr ""
 
-#: plugins/sudoers/policy.c:952
+#: plugins/sudoers/policy.c:955
 #, c-format
 msgid "invalid chroot directory: %s"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1163 plugins/sudoers/visudo.c:919
+#: plugins/sudoers/policy.c:1166 plugins/sudoers/visudo.c:919
 #: plugins/sudoers/visudo.c:1218
 #, c-format
 msgid "unable to execute %s"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1232 plugins/sudoers/policy.c:1267
-#: plugins/sudoers/policy.c:1289 plugins/sudoers/policy.c:1307
+#: plugins/sudoers/policy.c:1235 plugins/sudoers/policy.c:1270
+#: plugins/sudoers/policy.c:1292 plugins/sudoers/policy.c:1310
 #, c-format
 msgid "%s: invalid mode flags from sudo front end: 0x%x"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1330
+#: plugins/sudoers/policy.c:1333
 #, c-format
 msgid "Sudoers policy plugin version %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1332
+#: plugins/sudoers/policy.c:1335
 #, c-format
 msgid "Sudoers file grammar version %d\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1336
+#: plugins/sudoers/policy.c:1339
 #, c-format
 msgid ""
 "\n"
 "Sudoers path: %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1339
+#: plugins/sudoers/policy.c:1342
 #, c-format
 msgid "nsswitch path: %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1342
+#: plugins/sudoers/policy.c:1345
 #, c-format
 msgid "ldap.conf path: %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1344
+#: plugins/sudoers/policy.c:1347
 #, c-format
 msgid "ldap.secret path: %s\n"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1377
+#: plugins/sudoers/policy.c:1380
 #, c-format
 msgid "unable to register hook of type %d (version %d.%d)"
 msgstr ""
 
-#: plugins/sudoers/policy.c:1395
+#: plugins/sudoers/policy.c:1398
 #, c-format
 msgid "unable to deregister hook of type %d (version %d.%d)"
 msgstr ""
@@ -3400,17 +3406,17 @@ msgstr ""
 msgid "%s is not a regular file"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:1343 plugins/sudoers/timestamp.c:272 toke.l:1335
+#: plugins/sudoers/sudoers.c:1343 plugins/sudoers/timestamp.c:272 toke.l:1336
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:1348 plugins/sudoers/timestamp.c:279 toke.l:1340
+#: plugins/sudoers/sudoers.c:1348 plugins/sudoers/timestamp.c:279 toke.l:1341
 #, c-format
 msgid "%s is world writable"
 msgstr ""
 
-#: plugins/sudoers/sudoers.c:1352 plugins/sudoers/timestamp.c:284 toke.l:1343
+#: plugins/sudoers/sudoers.c:1352 plugins/sudoers/timestamp.c:284 toke.l:1344
 #, c-format
 msgid "%s is owned by gid %u, should be %u"
 msgstr ""
@@ -3523,16 +3529,6 @@ msgstr ""
 msgid "unknown search type %d"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1681
-#, c-format
-msgid "usage: %s [-hnRS] [-d dir] [-m num] [-s num] ID\n"
-msgstr ""
-
-#: plugins/sudoers/sudoreplay.c:1683
-#, c-format
-msgid "usage: %s [-h] [-d dir] -l [search expression]\n"
-msgstr ""
-
 #: plugins/sudoers/sudoreplay.c:1697
 #, c-format
 msgid ""
@@ -3618,7 +3614,7 @@ msgstr ""
 msgid "%s:%d:%d timestampowner: unknown user %s"
 msgstr ""
 
-#: plugins/sudoers/toke_util.c:159
+#: plugins/sudoers/toke_util.c:160
 msgid "sudoedit should not be specified with a path"
 msgstr ""
 
@@ -3812,6 +3808,6 @@ msgstr ""
 msgid "ignoring file name containing '.'"
 msgstr ""
 
-#: toke.l:1290
+#: toke.l:1291
 msgid "too many levels of includes"
 msgstr ""
diff --git a/po/sudo.pot b/po/sudo.pot
index 9fbec9093..0fda0899f 100644
--- a/po/sudo.pot
+++ b/po/sudo.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: sudo 1.9.16\n"
+"Project-Id-Version: sudo 1.9.16p2\n"
 "Report-Msgid-Bugs-To: https://bugzilla.sudo.ws\n"
-"POT-Creation-Date: 2024-06-08 09:06-0600\n"
+"POT-Creation-Date: 2025-06-08 16:30-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,35 +33,35 @@ msgstr ""
 #: lib/util/json.c:55 lib/util/json.c:197 lib/util/sudo_conf.c:218
 #: lib/util/sudo_conf.c:304 lib/util/sudo_conf.c:381 lib/util/sudo_conf.c:672
 #: src/conversation.c:81 src/exec_iolog.c:122 src/exec_iolog.c:133
-#: src/exec_iolog.c:210 src/exec_monitor.c:173 src/exec_monitor.c:430
-#: src/exec_monitor.c:436 src/exec_monitor.c:444 src/exec_monitor.c:452
-#: src/exec_monitor.c:459 src/exec_monitor.c:466 src/exec_monitor.c:473
-#: src/exec_monitor.c:480 src/exec_monitor.c:487 src/exec_monitor.c:494
-#: src/exec_monitor.c:501 src/exec_nopty.c:231 src/exec_nopty.c:240
-#: src/exec_nopty.c:247 src/exec_nopty.c:254 src/exec_nopty.c:261
-#: src/exec_nopty.c:268 src/exec_nopty.c:275 src/exec_nopty.c:282
-#: src/exec_nopty.c:289 src/exec_nopty.c:296 src/exec_nopty.c:303
-#: src/exec_nopty.c:310 src/exec_nopty.c:318 src/exec_nopty.c:326
-#: src/exec_nopty.c:748 src/exec_preload.c:347 src/exec_ptrace.c:475
+#: src/exec_iolog.c:210 src/exec_monitor.c:173 src/exec_monitor.c:441
+#: src/exec_monitor.c:447 src/exec_monitor.c:455 src/exec_monitor.c:463
+#: src/exec_monitor.c:470 src/exec_monitor.c:477 src/exec_monitor.c:484
+#: src/exec_monitor.c:491 src/exec_monitor.c:498 src/exec_monitor.c:505
+#: src/exec_monitor.c:512 src/exec_nopty.c:241 src/exec_nopty.c:250
+#: src/exec_nopty.c:257 src/exec_nopty.c:264 src/exec_nopty.c:271
+#: src/exec_nopty.c:278 src/exec_nopty.c:285 src/exec_nopty.c:292
+#: src/exec_nopty.c:299 src/exec_nopty.c:306 src/exec_nopty.c:313
+#: src/exec_nopty.c:320 src/exec_nopty.c:328 src/exec_nopty.c:336
+#: src/exec_nopty.c:756 src/exec_preload.c:347 src/exec_ptrace.c:475
 #: src/exec_ptrace.c:768 src/exec_ptrace.c:985 src/exec_ptrace.c:1098
 #: src/exec_ptrace.c:1273 src/exec_ptrace.c:1626 src/exec_ptrace.c:1653
-#: src/exec_ptrace.c:1845 src/exec_pty.c:599 src/exec_pty.c:783
-#: src/exec_pty.c:990 src/exec_pty.c:999 src/exec_pty.c:1006
-#: src/exec_pty.c:1013 src/exec_pty.c:1020 src/exec_pty.c:1027
-#: src/exec_pty.c:1034 src/exec_pty.c:1041 src/exec_pty.c:1048
-#: src/exec_pty.c:1055 src/exec_pty.c:1062 src/exec_pty.c:1069
-#: src/exec_pty.c:1077 src/load_plugins.c:100 src/load_plugins.c:125
+#: src/exec_ptrace.c:1845 src/exec_pty.c:604 src/exec_pty.c:788
+#: src/exec_pty.c:1003 src/exec_pty.c:1012 src/exec_pty.c:1019
+#: src/exec_pty.c:1026 src/exec_pty.c:1033 src/exec_pty.c:1040
+#: src/exec_pty.c:1047 src/exec_pty.c:1054 src/exec_pty.c:1061
+#: src/exec_pty.c:1068 src/exec_pty.c:1075 src/exec_pty.c:1082
+#: src/exec_pty.c:1090 src/load_plugins.c:100 src/load_plugins.c:125
 #: src/load_plugins.c:161 src/load_plugins.c:394 src/load_plugins.c:400
 #: src/parse_args.c:171 src/parse_args.c:192 src/parse_args.c:268
 #: src/parse_args.c:624 src/parse_args.c:646 src/parse_args.c:671
 #: src/preserve_fds.c:46 src/preserve_fds.c:131 src/selinux.c:89
 #: src/selinux.c:362 src/selinux.c:472 src/selinux.c:489 src/selinux.c:496
 #: src/sesh.c:206 src/sesh.c:240 src/sesh.c:246 src/sesh.c:253 src/sesh.c:259
-#: src/sesh.c:470 src/sudo.c:581 src/sudo.c:607 src/sudo.c:660 src/sudo.c:726
-#: src/sudo.c:737 src/sudo.c:764 src/sudo.c:787 src/sudo.c:796 src/sudo.c:805
-#: src/sudo.c:818 src/sudo.c:827 src/sudo.c:868 src/sudo.c:878 src/sudo.c:888
-#: src/sudo.c:921 src/sudo.c:923 src/sudo.c:1150 src/sudo.c:1171
-#: src/sudo.c:1462 src/sudo.c:1631 src/sudo.c:1858 src/sudo.c:2191
+#: src/sesh.c:470 src/sudo.c:581 src/sudo.c:607 src/sudo.c:663 src/sudo.c:729
+#: src/sudo.c:740 src/sudo.c:767 src/sudo.c:790 src/sudo.c:799 src/sudo.c:808
+#: src/sudo.c:821 src/sudo.c:830 src/sudo.c:871 src/sudo.c:881 src/sudo.c:891
+#: src/sudo.c:924 src/sudo.c:926 src/sudo.c:1153 src/sudo.c:1174
+#: src/sudo.c:1465 src/sudo.c:1634 src/sudo.c:1861 src/sudo.c:2194
 #: src/sudo_edit.c:89 src/sudo_edit.c:149 src/sudo_edit.c:430
 #: src/sudo_edit.c:439 src/sudo_edit.c:540 src/sudo_edit.c:547
 #: src/sudo_edit.c:692 src/sudo_edit.c:712 src/sudo_intercept_common.c:122
@@ -76,31 +76,31 @@ msgstr ""
 #: src/conversation.c:82 src/exec_intercept.c:112 src/exec_intercept.c:351
 #: src/exec_intercept.c:527 src/exec_intercept.c:591 src/exec_intercept.c:715
 #: src/exec_intercept.c:839 src/exec_iolog.c:122 src/exec_iolog.c:133
-#: src/exec_iolog.c:210 src/exec_monitor.c:430 src/exec_monitor.c:436
-#: src/exec_monitor.c:444 src/exec_monitor.c:452 src/exec_monitor.c:459
-#: src/exec_monitor.c:466 src/exec_monitor.c:473 src/exec_monitor.c:480
-#: src/exec_monitor.c:487 src/exec_monitor.c:494 src/exec_monitor.c:501
-#: src/exec_nopty.c:231 src/exec_nopty.c:240 src/exec_nopty.c:247
-#: src/exec_nopty.c:254 src/exec_nopty.c:261 src/exec_nopty.c:268
-#: src/exec_nopty.c:275 src/exec_nopty.c:282 src/exec_nopty.c:289
-#: src/exec_nopty.c:296 src/exec_nopty.c:303 src/exec_nopty.c:310
-#: src/exec_nopty.c:318 src/exec_nopty.c:326 src/exec_preload.c:347
+#: src/exec_iolog.c:210 src/exec_monitor.c:441 src/exec_monitor.c:447
+#: src/exec_monitor.c:455 src/exec_monitor.c:463 src/exec_monitor.c:470
+#: src/exec_monitor.c:477 src/exec_monitor.c:484 src/exec_monitor.c:491
+#: src/exec_monitor.c:498 src/exec_monitor.c:505 src/exec_monitor.c:512
+#: src/exec_nopty.c:241 src/exec_nopty.c:250 src/exec_nopty.c:257
+#: src/exec_nopty.c:264 src/exec_nopty.c:271 src/exec_nopty.c:278
+#: src/exec_nopty.c:285 src/exec_nopty.c:292 src/exec_nopty.c:299
+#: src/exec_nopty.c:306 src/exec_nopty.c:313 src/exec_nopty.c:320
+#: src/exec_nopty.c:328 src/exec_nopty.c:336 src/exec_preload.c:347
 #: src/exec_ptrace.c:475 src/exec_ptrace.c:768 src/exec_ptrace.c:985
-#: src/exec_ptrace.c:1653 src/exec_ptrace.c:1846 src/exec_pty.c:599
-#: src/exec_pty.c:990 src/exec_pty.c:999 src/exec_pty.c:1006
-#: src/exec_pty.c:1013 src/exec_pty.c:1020 src/exec_pty.c:1027
-#: src/exec_pty.c:1034 src/exec_pty.c:1041 src/exec_pty.c:1048
-#: src/exec_pty.c:1055 src/exec_pty.c:1062 src/exec_pty.c:1069
-#: src/exec_pty.c:1077 src/load_plugins.c:100 src/load_plugins.c:125
+#: src/exec_ptrace.c:1653 src/exec_ptrace.c:1846 src/exec_pty.c:604
+#: src/exec_pty.c:1003 src/exec_pty.c:1012 src/exec_pty.c:1019
+#: src/exec_pty.c:1026 src/exec_pty.c:1033 src/exec_pty.c:1040
+#: src/exec_pty.c:1047 src/exec_pty.c:1054 src/exec_pty.c:1061
+#: src/exec_pty.c:1068 src/exec_pty.c:1075 src/exec_pty.c:1082
+#: src/exec_pty.c:1090 src/load_plugins.c:100 src/load_plugins.c:125
 #: src/load_plugins.c:161 src/load_plugins.c:394 src/load_plugins.c:400
 #: src/parse_args.c:171 src/parse_args.c:193 src/parse_args.c:268
 #: src/parse_args.c:624 src/parse_args.c:646 src/parse_args.c:671
 #: src/preserve_fds.c:46 src/preserve_fds.c:131 src/selinux.c:89
 #: src/selinux.c:362 src/selinux.c:472 src/selinux.c:489 src/selinux.c:496
 #: src/sesh.c:206 src/sesh.c:471 src/sudo.c:229 src/sudo.c:581 src/sudo.c:607
-#: src/sudo.c:660 src/sudo.c:819 src/sudo.c:921 src/sudo.c:923 src/sudo.c:1150
-#: src/sudo.c:1171 src/sudo.c:1462 src/sudo.c:1631 src/sudo.c:1858
-#: src/sudo.c:2191 src/sudo_edit.c:89 src/sudo_edit.c:149 src/sudo_edit.c:430
+#: src/sudo.c:663 src/sudo.c:822 src/sudo.c:924 src/sudo.c:926 src/sudo.c:1153
+#: src/sudo.c:1174 src/sudo.c:1465 src/sudo.c:1634 src/sudo.c:1861
+#: src/sudo.c:2194 src/sudo_edit.c:89 src/sudo_edit.c:149 src/sudo_edit.c:430
 #: src/sudo_edit.c:439 src/sudo_edit.c:540 src/sudo_edit.c:547
 #: src/sudo_edit.c:692 src/sudo_edit.c:712 src/sudo_intercept_common.c:122
 #: src/sudo_intercept_common.c:347
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s is not a regular file"
 msgstr ""
 
-#: lib/util/sudo_conf.c:714 src/copy_file.c:164
+#: lib/util/sudo_conf.c:714 src/copy_file.c:171
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr ""
@@ -204,12 +204,12 @@ msgstr ""
 msgid "unable to change AppArmor profile to %s"
 msgstr ""
 
-#: src/copy_file.c:94
+#: src/copy_file.c:98
 #, c-format
 msgid "%s: truncate %s to zero bytes? (y/n) [n] "
 msgstr ""
 
-#: src/copy_file.c:98
+#: src/copy_file.c:102
 #, c-format
 msgid "not overwriting %s"
 msgstr ""
@@ -219,22 +219,22 @@ msgstr ""
 msgid "unable to read from %s"
 msgstr ""
 
-#: src/copy_file.c:137 src/sudo_edit.c:320
+#: src/copy_file.c:144 src/sudo_edit.c:320
 #, c-format
 msgid "unable to write to %s"
 msgstr ""
 
-#: src/copy_file.c:151
+#: src/copy_file.c:158
 #, c-format
 msgid "unable to stat %s"
 msgstr ""
 
-#: src/copy_file.c:155 src/sesh.c:312 src/sudo_edit.c:197
+#: src/copy_file.c:162 src/sesh.c:312 src/sudo_edit.c:197
 #, c-format
 msgid "%s: not a regular file"
 msgstr ""
 
-#: src/copy_file.c:159
+#: src/copy_file.c:166
 #, c-format
 msgid "%s: bad file mode: 0%o"
 msgstr ""
@@ -284,18 +284,18 @@ msgstr ""
 msgid "starting from %s"
 msgstr ""
 
-#: src/exec.c:278 src/exec.c:351 src/exec_monitor.c:564 src/exec_monitor.c:566
-#: src/exec_pty.c:1148 src/exec_pty.c:1150 src/signal.c:144 src/signal.c:151
+#: src/exec.c:278 src/exec.c:351 src/exec_monitor.c:575 src/exec_monitor.c:577
+#: src/exec_pty.c:1160 src/exec_pty.c:1162 src/signal.c:144 src/signal.c:151
 #: src/signal.c:165 src/suspend_parent.c:143
 #, c-format
 msgid "unable to set handler for signal %d"
 msgstr ""
 
-#: src/exec.c:447
+#: src/exec.c:444
 msgid "intercept mode is not supported with SELinux RBAC on this system"
 msgstr ""
 
-#: src/exec.c:452
+#: src/exec.c:449
 msgid "unable to log sub-commands with SELinux RBAC on this system"
 msgstr ""
 
@@ -305,38 +305,38 @@ msgstr ""
 
 #: src/exec_intercept.c:71 src/exec_iolog.c:163 src/exec_iolog.c:173
 #: src/exec_iolog.c:218 src/exec_iolog.c:225 src/exec_iolog.c:252
-#: src/exec_monitor.c:438 src/exec_monitor.c:446 src/exec_monitor.c:454
-#: src/exec_monitor.c:461 src/exec_monitor.c:468 src/exec_monitor.c:475
-#: src/exec_monitor.c:482 src/exec_monitor.c:489 src/exec_monitor.c:496
-#: src/exec_monitor.c:503 src/exec_nopty.c:233 src/exec_nopty.c:242
-#: src/exec_nopty.c:249 src/exec_nopty.c:256 src/exec_nopty.c:263
-#: src/exec_nopty.c:270 src/exec_nopty.c:277 src/exec_nopty.c:284
-#: src/exec_nopty.c:291 src/exec_nopty.c:298 src/exec_nopty.c:305
-#: src/exec_nopty.c:312 src/exec_nopty.c:320 src/exec_nopty.c:328
-#: src/exec_nopty.c:387 src/exec_nopty.c:457 src/exec_pty.c:441
-#: src/exec_pty.c:555 src/exec_pty.c:605 src/exec_pty.c:992 src/exec_pty.c:1001
-#: src/exec_pty.c:1008 src/exec_pty.c:1015 src/exec_pty.c:1022
-#: src/exec_pty.c:1029 src/exec_pty.c:1036 src/exec_pty.c:1043
-#: src/exec_pty.c:1050 src/exec_pty.c:1057 src/exec_pty.c:1064
-#: src/exec_pty.c:1071
+#: src/exec_monitor.c:449 src/exec_monitor.c:457 src/exec_monitor.c:465
+#: src/exec_monitor.c:472 src/exec_monitor.c:479 src/exec_monitor.c:486
+#: src/exec_monitor.c:493 src/exec_monitor.c:500 src/exec_monitor.c:507
+#: src/exec_monitor.c:514 src/exec_nopty.c:243 src/exec_nopty.c:252
+#: src/exec_nopty.c:259 src/exec_nopty.c:266 src/exec_nopty.c:273
+#: src/exec_nopty.c:280 src/exec_nopty.c:287 src/exec_nopty.c:294
+#: src/exec_nopty.c:301 src/exec_nopty.c:308 src/exec_nopty.c:315
+#: src/exec_nopty.c:322 src/exec_nopty.c:330 src/exec_nopty.c:338
+#: src/exec_nopty.c:397 src/exec_nopty.c:467 src/exec_pty.c:446
+#: src/exec_pty.c:560 src/exec_pty.c:610 src/exec_pty.c:1005
+#: src/exec_pty.c:1014 src/exec_pty.c:1021 src/exec_pty.c:1028
+#: src/exec_pty.c:1035 src/exec_pty.c:1042 src/exec_pty.c:1049
+#: src/exec_pty.c:1056 src/exec_pty.c:1063 src/exec_pty.c:1070
+#: src/exec_pty.c:1077 src/exec_pty.c:1084
 msgid "unable to add event to queue"
 msgstr ""
 
-#: src/exec_intercept.c:324 src/sudo.c:1056
+#: src/exec_intercept.c:324 src/sudo.c:1059
 msgid "command not set by the security policy"
 msgstr ""
 
-#: src/exec_intercept.c:403 src/exec_intercept.c:443 src/sudo.c:1274
-#: src/sudo.c:1319 src/sudo.c:1363
+#: src/exec_intercept.c:403 src/exec_intercept.c:443 src/sudo.c:1277
+#: src/sudo.c:1322 src/sudo.c:1366
 msgid "command rejected by policy"
 msgstr ""
 
-#: src/exec_intercept.c:514 src/sudo.c:1961
+#: src/exec_intercept.c:514 src/sudo.c:1964
 msgid "approval plugin error"
 msgstr ""
 
-#: src/exec_intercept.c:539 src/sudo.c:1279 src/sudo.c:1324 src/sudo.c:1368
-#: src/sudo.c:1442
+#: src/exec_intercept.c:539 src/sudo.c:1282 src/sudo.c:1327 src/sudo.c:1371
+#: src/sudo.c:1445
 msgid "policy plugin error"
 msgstr ""
 
@@ -382,53 +382,53 @@ msgstr ""
 msgid "error changing window size"
 msgstr ""
 
-#: src/exec_monitor.c:330
+#: src/exec_monitor.c:329
 msgid "error reading from socketpair"
 msgstr ""
 
-#: src/exec_monitor.c:342
+#: src/exec_monitor.c:341
 #, c-format
 msgid "unexpected reply type on backchannel: %d"
 msgstr ""
 
-#: src/exec_monitor.c:578
+#: src/exec_monitor.c:589
 msgid "unable to set controlling tty"
 msgstr ""
 
-#: src/exec_monitor.c:590 src/exec_nopty.c:572 src/exec_pty.c:1126
-#: src/exec_pty.c:1135
+#: src/exec_monitor.c:604 src/exec_nopty.c:583 src/exec_pty.c:1138
+#: src/exec_pty.c:1147
 msgid "unable to create sockets"
 msgstr ""
 
-#: src/exec_monitor.c:599
+#: src/exec_monitor.c:613
 msgid "unable to receive message from parent"
 msgstr ""
 
-#: src/exec_monitor.c:614 src/exec_nopty.c:606 src/exec_pty.c:1336
-#: src/sudo_edit.c:361 src/tgetpass.c:310
+#: src/exec_monitor.c:628 src/exec_nopty.c:617 src/exec_pty.c:1343
+#: src/sudo_edit.c:361 src/tgetpass.c:315
 msgid "unable to fork"
 msgstr ""
 
-#: src/exec_monitor.c:618 src/exec_monitor.c:720 src/exec_nopty.c:712
+#: src/exec_monitor.c:632 src/exec_monitor.c:734 src/exec_nopty.c:720
 msgid "unable to restore tty label"
 msgstr ""
 
-#: src/exec_monitor.c:629 src/exec_monitor.c:678 src/sesh.c:217 src/sudo.c:1225
+#: src/exec_monitor.c:643 src/exec_monitor.c:692 src/sesh.c:217 src/sudo.c:1228
 #, c-format
 msgid "unable to execute %s"
 msgstr ""
 
-#: src/exec_nopty.c:507 src/exec_nopty.c:517 src/exec_nopty.c:527
-#: src/exec_nopty.c:563 src/exec_pty.c:1224 src/exec_pty.c:1251
-#: src/exec_pty.c:1274 src/exec_pty.c:1292 src/tgetpass.c:306
+#: src/exec_nopty.c:515 src/exec_nopty.c:525 src/exec_nopty.c:535
+#: src/exec_nopty.c:574 src/exec_pty.c:1231 src/exec_pty.c:1258
+#: src/exec_pty.c:1281 src/exec_pty.c:1299 src/tgetpass.c:311
 msgid "unable to create pipe"
 msgstr ""
 
-#: src/exec_nopty.c:557 src/exec_pty.c:1157
+#: src/exec_nopty.c:565 src/exec_pty.c:1169
 msgid "policy plugin failed session initialization"
 msgstr ""
 
-#: src/exec_nopty.c:700 src/exec_pty.c:1437
+#: src/exec_nopty.c:708 src/exec_pty.c:1444
 msgid "error in event loop"
 msgstr ""
 
@@ -484,33 +484,33 @@ msgstr ""
 msgid "unable to get registers for process %d"
 msgstr ""
 
-#: src/exec_pty.c:87
-msgid "unable to allocate pty"
-msgstr ""
-
-#: src/exec_pty.c:118 src/exec_pty.c:257 src/tgetpass.c:251
+#: src/exec_pty.c:80 src/exec_pty.c:262 src/tgetpass.c:256
 msgid "unable to restore terminal settings"
 msgstr ""
 
-#: src/exec_pty.c:218
+#: src/exec_pty.c:122
+msgid "unable to allocate pty"
+msgstr ""
+
+#: src/exec_pty.c:223
 msgid "unable to set handler for SIGCONT"
 msgstr ""
 
-#: src/exec_pty.c:267
+#: src/exec_pty.c:272
 #, c-format
 msgid "unable to set handler for SIG%s"
 msgstr ""
 
-#: src/exec_pty.c:291
+#: src/exec_pty.c:296
 #, c-format
 msgid "unable to restore handler for SIG%s"
 msgstr ""
 
-#: src/exec_pty.c:319
+#: src/exec_pty.c:324
 msgid "unable to restore handler for SIGCONT"
 msgstr ""
 
-#: src/exec_pty.c:1385
+#: src/exec_pty.c:1392
 msgid "unable to send message to monitor process"
 msgstr ""
 
@@ -971,129 +971,129 @@ msgstr ""
 msgid "you do not exist in the %s database"
 msgstr ""
 
-#: src/sudo.c:632
+#: src/sudo.c:635
 msgid "unable to determine tty"
 msgstr ""
 
-#: src/sudo.c:955
+#: src/sudo.c:958
 msgid ""
 "The \"no new privileges\" flag is set, which prevents sudo from running as "
 "root."
 msgstr ""
 
-#: src/sudo.c:957
+#: src/sudo.c:960
 msgid ""
 "If sudo is running in a container, you may need to adjust the container "
 "configuration to disable the flag."
 msgstr ""
 
-#: src/sudo.c:991
+#: src/sudo.c:994
 #, c-format
 msgid "%s must be owned by uid %d and have the setuid bit set"
 msgstr ""
 
-#: src/sudo.c:994
+#: src/sudo.c:997
 #, c-format
 msgid ""
 "effective uid is not %d, is %s on a file system with the 'nosuid' option set "
 "or an NFS file system without root privileges?"
 msgstr ""
 
-#: src/sudo.c:1000
+#: src/sudo.c:1003
 #, c-format
 msgid "effective uid is not %d, is sudo installed setuid root?"
 msgstr ""
 
-#: src/sudo.c:1016 src/tgetpass.c:332
+#: src/sudo.c:1019 src/tgetpass.c:337
 msgid "unable to set supplementary group IDs"
 msgstr ""
 
-#: src/sudo.c:1023
+#: src/sudo.c:1026
 #, c-format
 msgid "unable to set effective gid to runas gid %u"
 msgstr ""
 
-#: src/sudo.c:1029
+#: src/sudo.c:1032
 #, c-format
 msgid "unable to set gid to runas gid %u"
 msgstr ""
 
-#: src/sudo.c:1060
+#: src/sudo.c:1063
 msgid "argv not set by the security policy"
 msgstr ""
 
-#: src/sudo.c:1064
+#: src/sudo.c:1067
 msgid "envp not set by the security policy"
 msgstr ""
 
-#: src/sudo.c:1086
+#: src/sudo.c:1089
 #, c-format
 msgid "unexpected child termination condition: %d"
 msgstr ""
 
-#: src/sudo.c:1198
+#: src/sudo.c:1201
 msgid "unable to initialize policy plugin"
 msgstr ""
 
-#: src/sudo.c:1259
+#: src/sudo.c:1262
 #, c-format
 msgid "policy plugin %s is missing the \"check_policy\" method"
 msgstr ""
 
-#: src/sudo.c:1305
+#: src/sudo.c:1308
 #, c-format
 msgid "policy plugin %s does not support listing privileges"
 msgstr ""
 
-#: src/sudo.c:1349
+#: src/sudo.c:1352
 #, c-format
 msgid "policy plugin %s does not support the -v option"
 msgstr ""
 
-#: src/sudo.c:1387
+#: src/sudo.c:1390
 #, c-format
 msgid "policy plugin %s does not support the -k/-K options"
 msgstr ""
 
-#: src/sudo.c:1516
+#: src/sudo.c:1519
 #, c-format
 msgid "error initializing I/O plugin %s"
 msgstr ""
 
-#: src/sudo.c:1519
+#: src/sudo.c:1522
 msgid "error initializing I/O plugin"
 msgstr ""
 
-#: src/sudo.c:1668
+#: src/sudo.c:1671
 #, c-format
 msgid "error initializing audit plugin %s"
 msgstr ""
 
-#: src/sudo.c:1747
+#: src/sudo.c:1750
 #, c-format
 msgid "%s: unable to log error event%s%s"
 msgstr ""
 
-#: src/sudo.c:1783
+#: src/sudo.c:1786
 #, c-format
 msgid "%s: unable to log accept event%s%s"
 msgstr ""
 
-#: src/sudo.c:1788 src/sudo.c:1826
+#: src/sudo.c:1791 src/sudo.c:1829
 msgid "audit plugin error"
 msgstr ""
 
-#: src/sudo.c:1821
+#: src/sudo.c:1824
 #, c-format
 msgid "%s: unable to log reject event%s%s"
 msgstr ""
 
-#: src/sudo.c:1881
+#: src/sudo.c:1884
 #, c-format
 msgid "error initializing approval plugin %s"
 msgstr ""
 
-#: src/sudo.c:1951
+#: src/sudo.c:1954
 msgid "command rejected by approver"
 msgstr ""
 
@@ -1170,37 +1170,37 @@ msgstr ""
 msgid "unable to read password"
 msgstr ""
 
-#: src/tgetpass.c:141
+#: src/tgetpass.c:142
+msgid ""
+"a terminal is required to read the password; either use ssh's -t option or "
+"configure an askpass helper"
+msgstr ""
+
+#: src/tgetpass.c:145
 msgid ""
 "a terminal is required to read the password; either use the -S option to "
 "read from standard input or configure an askpass helper"
 msgstr ""
 
-#: src/tgetpass.c:152
+#: src/tgetpass.c:157
 msgid "no askpass program specified, try setting SUDO_ASKPASS"
 msgstr ""
 
-#: src/tgetpass.c:327
+#: src/tgetpass.c:332
 #, c-format
 msgid "unable to set gid to %u"
 msgstr ""
 
-#: src/tgetpass.c:337
+#: src/tgetpass.c:342
 #, c-format
 msgid "unable to set uid to %u"
 msgstr ""
 
-#: src/tgetpass.c:342
+#: src/tgetpass.c:347
 #, c-format
 msgid "unable to run %s"
 msgstr ""
 
-#: src/ttyname.c:139 src/ttyname.c:182 src/ttyname.c:199 src/ttyname.c:284
-#: src/ttyname.c:312 src/ttyname.c:356
-#, c-format
-msgid "unable to find terminal name for device %u, %u"
-msgstr ""
-
 #: src/utmp.c:283
 msgid "unable to save stdin"
 msgstr ""