From 6b0a909d9a90b3c5c2ab61d3d796ed03f834df08 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Tue, 3 Sep 2013 14:47:34 -0600
Subject: [PATCH] Do not use "setup" as a verb; bug #614

---
 plugins/sudoers/auth/bsdauth.c |   2 +-
 plugins/sudoers/po/sudoers.pot | 122 ++++++++++++++++-----------------
 src/po/sudo.pot                |   4 +-
 src/selinux.c                  |   2 +-
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c
index 7ddf37968..c2c44ed57 100644
--- a/plugins/sudoers/auth/bsdauth.c
+++ b/plugins/sudoers/auth/bsdauth.c
@@ -97,7 +97,7 @@ bsdauth_init(struct passwd *pw, sudo_auth *auth)
      if (auth_setitem(state.as, AUTHV_STYLE, login_style) < 0 ||
 	auth_setitem(state.as, AUTHV_NAME, pw->pw_name) < 0 ||
 	auth_setitem(state.as, AUTHV_CLASS, login_class) < 0) {
-	log_warning(NO_MAIL, N_("unable to setup authentication"));
+	log_warning(NO_MAIL, N_("unable to initialize BSD authentication"));
 	auth_close(state.as);
 	login_close(state.lc);
 	debug_return_int(AUTH_FATAL);
diff --git a/plugins/sudoers/po/sudoers.pot b/plugins/sudoers/po/sudoers.pot
index 656ed3b79..dc0778395 100644
--- a/plugins/sudoers/po/sudoers.pot
+++ b/plugins/sudoers/po/sudoers.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sudo 1.8.8\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2013-08-16 10:18-0600\n"
+"POT-Creation-Date: 2013-09-03 14:44-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"
@@ -48,7 +48,7 @@ msgid "invalid authentication type"
 msgstr ""
 
 #: plugins/sudoers/auth/bsdauth.c:100
-msgid "unable to setup authentication"
+msgid "unable to initialize BSD authentication"
 msgstr ""
 
 #: plugins/sudoers/auth/fwtk.c:59
@@ -694,7 +694,7 @@ msgstr ""
 msgid "sudo_putenv: corrupted envp, length mismatch"
 msgstr ""
 
-#: plugins/sudoers/env.c:1012
+#: plugins/sudoers/env.c:1014
 #, c-format
 msgid ""
 "sorry, you are not allowed to set the following environment variables: %s"
@@ -729,38 +729,38 @@ msgstr ""
 msgid "Local IP address and netmask pairs:\n"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:131 plugins/sudoers/iolog.c:144
+#: plugins/sudoers/iolog.c:99 plugins/sudoers/iolog.c:112
 #: plugins/sudoers/timestamp.c:200 plugins/sudoers/timestamp.c:244
 #, c-format
 msgid "%s exists but is not a directory (0%o)"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:141 plugins/sudoers/iolog.c:155
-#: plugins/sudoers/iolog.c:159 plugins/sudoers/timestamp.c:165
+#: plugins/sudoers/iolog.c:109 plugins/sudoers/iolog.c:123
+#: plugins/sudoers/iolog.c:127 plugins/sudoers/timestamp.c:165
 #: plugins/sudoers/timestamp.c:221 plugins/sudoers/timestamp.c:271
 #, c-format
 msgid "unable to mkdir %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:217 plugins/sudoers/sudoers.c:710
-#: plugins/sudoers/sudoreplay.c:367 plugins/sudoers/sudoreplay.c:828
-#: plugins/sudoers/sudoreplay.c:991 plugins/sudoers/timestamp.c:155
+#: plugins/sudoers/iolog.c:185 plugins/sudoers/sudoers.c:710
+#: plugins/sudoers/sudoreplay.c:346 plugins/sudoers/sudoreplay.c:808
+#: plugins/sudoers/sudoreplay.c:971 plugins/sudoers/timestamp.c:155
 #: plugins/sudoers/visudo.c:824
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:250 plugins/sudoers/sudoers.c:713
+#: plugins/sudoers/iolog.c:218 plugins/sudoers/sudoers.c:713
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:274 plugins/sudoers/timestamp.c:159
+#: plugins/sudoers/iolog.c:242 plugins/sudoers/timestamp.c:159
 #, c-format
 msgid "unable to write to %s"
 msgstr ""
 
-#: plugins/sudoers/iolog.c:334
+#: plugins/sudoers/iolog.c:302 plugins/sudoers/iolog.c:491
 #, c-format
 msgid "unable to create %s"
 msgstr ""
@@ -810,64 +810,64 @@ msgstr ""
 msgid "you must set TLS_CERT in %s to use SSL"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1077
+#: plugins/sudoers/ldap.c:1081
 #, c-format
 msgid "unable to get GMT time"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1083
+#: plugins/sudoers/ldap.c:1087
 #, c-format
 msgid "unable to format timestamp"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1091
+#: plugins/sudoers/ldap.c:1095
 #, c-format
 msgid "unable to build time filter"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1310
+#: plugins/sudoers/ldap.c:1314
 #, c-format
 msgid "sudo_ldap_build_pass1 allocation mismatch"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1883
+#: plugins/sudoers/ldap.c:1887
 #, c-format
 msgid ""
 "\n"
 "LDAP Role: %s\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1885
+#: plugins/sudoers/ldap.c:1889
 #, c-format
 msgid ""
 "\n"
 "LDAP Role: UNKNOWN\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1932
+#: plugins/sudoers/ldap.c:1936
 #, c-format
 msgid "    Order: %s\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:1940 plugins/sudoers/parse.c:515
+#: plugins/sudoers/ldap.c:1944 plugins/sudoers/parse.c:515
 #: plugins/sudoers/sssd.c:1242
 #, c-format
 msgid "    Commands:\n"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:2477
+#: plugins/sudoers/ldap.c:2481
 #, c-format
 msgid "unable to initialize LDAP: %s"
 msgstr ""
 
-#: plugins/sudoers/ldap.c:2511
+#: plugins/sudoers/ldap.c:2519
 #, c-format
 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:2747
+#: plugins/sudoers/ldap.c:2755
 #, c-format
 msgid "invalid sudoOrder attribute: %s"
 msgstr ""
@@ -1304,134 +1304,134 @@ msgstr ""
 msgid "unknown group: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:305
+#: plugins/sudoers/sudoreplay.c:278
 #, c-format
 msgid "invalid filter option: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:318
+#: plugins/sudoers/sudoreplay.c:291
 #, c-format
 msgid "invalid max wait: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:324
+#: plugins/sudoers/sudoreplay.c:297
 #, c-format
 msgid "invalid speed factor: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:327 plugins/sudoers/visudo.c:191
+#: plugins/sudoers/sudoreplay.c:300 plugins/sudoers/visudo.c:191
 #, c-format
 msgid "%s version %s\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:352
+#: plugins/sudoers/sudoreplay.c:332
 #, c-format
 msgid "%s/%.2s/%.2s/%.2s/timing: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:358
+#: plugins/sudoers/sudoreplay.c:338
 #, c-format
 msgid "%s/%s/timing: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:376
+#: plugins/sudoers/sudoreplay.c:354
 #, c-format
 msgid "Replaying sudo session: %s\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:382
+#: plugins/sudoers/sudoreplay.c:360
 #, c-format
 msgid "Warning: your terminal is too small to properly replay the log.\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:383
+#: plugins/sudoers/sudoreplay.c:361
 #, c-format
 msgid "Log geometry is %d x %d, your terminal's geometry is %d x %d."
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:413
+#: plugins/sudoers/sudoreplay.c:391
 #, c-format
 msgid "unable to set tty to raw mode"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:429
+#: plugins/sudoers/sudoreplay.c:407
 #, c-format
 msgid "invalid timing file line: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:512
+#: plugins/sudoers/sudoreplay.c:490
 #, c-format
 msgid "writing to standard output"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:654 plugins/sudoers/sudoreplay.c:679
+#: plugins/sudoers/sudoreplay.c:634 plugins/sudoers/sudoreplay.c:659
 #, c-format
 msgid "ambiguous expression \"%s\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:696
+#: plugins/sudoers/sudoreplay.c:676
 #, c-format
 msgid "too many parenthesized expressions, max %d"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:707
+#: plugins/sudoers/sudoreplay.c:687
 #, c-format
 msgid "unmatched ')' in expression"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:713
+#: plugins/sudoers/sudoreplay.c:693
 #, c-format
 msgid "unknown search term \"%s\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:727
+#: plugins/sudoers/sudoreplay.c:707
 #, c-format
 msgid "%s requires an argument"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:731 plugins/sudoers/sudoreplay.c:1071
+#: plugins/sudoers/sudoreplay.c:711 plugins/sudoers/sudoreplay.c:1051
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:737
+#: plugins/sudoers/sudoreplay.c:717
 #, c-format
 msgid "could not parse date \"%s\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:750
+#: plugins/sudoers/sudoreplay.c:730
 #, c-format
 msgid "unmatched '(' in expression"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:752
+#: plugins/sudoers/sudoreplay.c:732
 #, c-format
 msgid "illegal trailing \"or\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:754
+#: plugins/sudoers/sudoreplay.c:734
 #, c-format
 msgid "illegal trailing \"!\""
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1195
+#: plugins/sudoers/sudoreplay.c:1179
 #, c-format
 msgid "usage: %s [-h] [-d dir] [-m num] [-s num] ID\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1198
+#: plugins/sudoers/sudoreplay.c:1182
 #, c-format
 msgid "usage: %s [-h] [-d dir] -l [search expression]\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1207
+#: plugins/sudoers/sudoreplay.c:1191
 #, c-format
 msgid ""
 "%s - replay sudo session logs\n"
 "\n"
 msgstr ""
 
-#: plugins/sudoers/sudoreplay.c:1209
+#: plugins/sudoers/sudoreplay.c:1193
 msgid ""
 "\n"
 "Options:\n"
@@ -1629,64 +1629,64 @@ msgstr ""
 msgid "parse error in %s\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:856 plugins/sudoers/visudo.c:861
+#: plugins/sudoers/visudo.c:857 plugins/sudoers/visudo.c:864
 #, c-format
 msgid "%s: parsed OK\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:908
+#: plugins/sudoers/visudo.c:912
 #, c-format
 msgid "%s busy, try again later"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:952
+#: plugins/sudoers/visudo.c:956
 #, c-format
 msgid "specified editor (%s) doesn't exist"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:975
+#: plugins/sudoers/visudo.c:979
 #, c-format
 msgid "unable to stat editor (%s)"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1023
+#: plugins/sudoers/visudo.c:1027
 #, c-format
 msgid "no editor found (editor path = %s)"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1117
+#: plugins/sudoers/visudo.c:1120
 #, c-format
 msgid "Error: cycle in %s_Alias `%s'"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1118
+#: plugins/sudoers/visudo.c:1121
 #, c-format
 msgid "Warning: cycle in %s_Alias `%s'"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1121
+#: plugins/sudoers/visudo.c:1127
 #, c-format
 msgid "Error: %s_Alias `%s' referenced but not defined"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1122
+#: plugins/sudoers/visudo.c:1128
 #, c-format
 msgid "Warning: %s_Alias `%s' referenced but not defined"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1248
+#: plugins/sudoers/visudo.c:1253
 #, c-format
 msgid "%s: unused %s_Alias %s"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1310
+#: plugins/sudoers/visudo.c:1315
 #, c-format
 msgid ""
 "%s - safely edit the sudoers file\n"
 "\n"
 msgstr ""
 
-#: plugins/sudoers/visudo.c:1312
+#: plugins/sudoers/visudo.c:1317
 msgid ""
 "\n"
 "Options:\n"
diff --git a/src/po/sudo.pot b/src/po/sudo.pot
index c02ccc20c..37c555bfd 100644
--- a/src/po/sudo.pot
+++ b/src/po/sudo.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sudo 1.8.8\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2013-08-16 10:14-0600\n"
+"POT-Creation-Date: 2013-09-03 14:44-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"
@@ -543,7 +543,7 @@ msgstr ""
 
 #: src/selinux.c:342
 #, c-format
-msgid "unable to setup tty context for %s"
+msgid "unable to set tty context to %s"
 msgstr ""
 
 #: src/selinux.c:381
diff --git a/src/selinux.c b/src/selinux.c
index 30d6949ab..a4fc796fd 100644
--- a/src/selinux.c
+++ b/src/selinux.c
@@ -339,7 +339,7 @@ selinux_setup(const char *role, const char *type, const char *ttyn,
 	goto done;
     
     if (relabel_tty(ttyn, ptyfd) < 0) {
-	warning(_("unable to setup tty context for %s"), se_state.new_context);
+	warning(_("unable to set tty context to %s"), se_state.new_context);
 	goto done;
     }
 
-- 
2.40.0