14 files changed, 14 insertions, 2 deletions
diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index fe5ecacf6b..73ce04459b 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -75,6 +75,7 @@ main(argc, argv)
     int errflg = 0;
     int quiet = 0;
 
+    setlocale(LC_MESSAGES, "");
     progname = GET_PROGNAME(argv[0]);
 
     while ((c = getopt(argc, argv, "54qc:")) != -1) {
diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index 682dc64704..802229ae00 100644
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -782,6 +782,7 @@ main(argc, argv)
     struct k5_data k5;
     int authed_k5 = 0;
 
+    setlocale(LC_MESSAGES, "");
     progname = GET_PROGNAME(argv[0]);
 
     /* Ensure we can be driven from a pipe */
diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index 1ecc5f8d81..d191f85c82 100644
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -109,6 +109,7 @@ main(argc, argv)
     char *name;
     int mode;
 
+    setlocale(LC_MESSAGES, "");
     progname = GET_PROGNAME(argv[0]);
 
     name = NULL;
diff --git a/src/clients/kpasswd/kpasswd.c b/src/clients/kpasswd/kpasswd.c
index 27325cc6df..b4b6eadd4d 100644
--- a/src/clients/kpasswd/kpasswd.c
+++ b/src/clients/kpasswd/kpasswd.c
@@ -59,6 +59,7 @@ int main(int argc, char *argv[])
     int result_code;
     krb5_data result_code_string, result_string;
 
+    setlocale(LC_MESSAGES, "");
     if (argc > 2) {
         fprintf(stderr, _("usage: %s [principal]\n"), argv[0]);
         exit(1);
diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index 9173daa769..74ecf58a8e 100644
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
     char *sname = NULL, *for_user = NULL;
     int canon = 0, unknown = 0, proxy = 0;
 
-
+    setlocale(LC_MESSAGES, "");
     set_com_err_hook (extended_com_err_fn);
 
     prog = strrchr(argv[0], '/');
diff --git a/src/kadmin/cli/ss_wrapper.c b/src/kadmin/cli/ss_wrapper.c
index bde9b15612..f86c215f04 100644
--- a/src/kadmin/cli/ss_wrapper.c
+++ b/src/kadmin/cli/ss_wrapper.c
@@ -39,6 +39,7 @@ main(int argc, char *argv[])
     krb5_error_code retval;
     int sci_idx, code = 0;
 
+    setlocale(LC_MESSAGES, "");
     whoami = ((whoami = strrchr(argv[0], '/')) ? whoami+1 : argv[0]);
 
     request = kadmin_startup(argc, argv);
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 7f5d6746b4..70a04e2592 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -198,6 +198,7 @@ int main(argc, argv)
     int cmd_argc;
     krb5_error_code retval;
 
+    setlocale(LC_MESSAGES, "");
     set_com_err_hook(extended_com_err_fn);
 
     /*
diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index 7fe15449e3..c1106b156b 100644
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -45,6 +45,7 @@ int main(argc, argv)
     krb5_error_code retval;
     int sci_idx;
 
+    setlocale(LC_MESSAGES, "");
     retval = krb5_init_context(&kcontext);
     if (retval) {
         com_err(argv[0], retval, _("while initializing krb5"));
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 8c11480e8b..04d8c4b841 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -246,6 +246,7 @@ int main(int argc, char *argv[])
 
     kdb_log_context *log_ctx;
 
+    setlocale(LC_MESSAGES, "");
     setvbuf(stderr, NULL, _IONBF, 0);
 
     /* This is OID value the Krb5_Name NameType */
diff --git a/src/kdc/main.c b/src/kdc/main.c
index b2a52dd1a5..e2446cdd0a 100644
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -953,6 +953,7 @@ int main(int argc, char **argv)
     int errout = 0;
     int i;
 
+    setlocale(LC_MESSAGES, "");
     if (strrchr(argv[0], '/'))
         argv[0] = strrchr(argv[0], '/')+1;
 
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
index 022b94f80d..6c81083fed 100644
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
@@ -261,6 +261,7 @@ main(int argc, char *argv[])
     /*
      * Ensure that "progname" is set before calling com_err.
      */
+    setlocale(LC_MESSAGES, "");
     progname = (strrchr(argv[0], '/') ? strrchr(argv[0], '/')+1 : argv[0]);
 
     retval = kadm5_init_krb5_context(&util_context);
diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 1aa78773b1..f1b676fb8a 100644
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -96,6 +96,7 @@ main(argc, argv)
     krb5_creds *my_creds;
     krb5_auth_context auth_context;
 
+    setlocale(LC_MESSAGES, "");
     retval = krb5_init_context(&context);
     if (retval) {
         com_err(argv[0], retval, _("while initializing krb5"));
diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 58486bb28d..259d633681 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -189,6 +189,7 @@ main(argc, argv)
     int ret = 0;
     kdb_log_context *log_ctx;
 
+    setlocale(LC_MESSAGES, "");
     PRS(argv);
 
     log_ctx = kpropd_context->kdblog_context;
diff --git a/src/slave/kproplog.c b/src/slave/kproplog.c
index 0af30d92cb..e8aac1e8eb 100644
--- a/src/slave/kproplog.c
+++ b/src/slave/kproplog.c
@@ -495,7 +495,7 @@ main(int argc, char **argv)
     kdb_hlog_t          *ulog = NULL;
     char                **db_args = NULL; /* XXX */
 
-    (void) setlocale(LC_ALL, "");
+    setlocale(LC_MESSAGES, "");
 
 #if !defined(TEXT_DOMAIN)
 #define TEXT_DOMAIN "SYS_TEST"