5 files changed, 7 insertions, 6 deletions
diff --git a/src/kadmin/cli/ss_wrapper.c b/src/kadmin/cli/ss_wrapper.c
index f86c215f0..bf884d1ec 100644
--- a/src/kadmin/cli/ss_wrapper.c
+++ b/src/kadmin/cli/ss_wrapper.c
@@ -39,7 +39,7 @@ main(int argc, char *argv[])
     krb5_error_code retval;
     int sci_idx, code = 0;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     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 df9c080a0..e4d8d6c51 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -197,7 +197,7 @@ int main(argc, argv)
     int cmd_argc;
     krb5_error_code retval;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     set_com_err_hook(extended_com_err_fn);
 
     /*
diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index c1106b156..a969a4633 100644
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -45,7 +45,7 @@ int main(argc, argv)
     krb5_error_code retval;
     int sci_idx;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     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 6859144ca..0976a8ad4 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
 
     verto_ctx *ctx;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     setvbuf(stderr, NULL, _IONBF, 0);
 
     /* This is OID value the Krb5_Name NameType */
diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index de1578b56..11d018a50 100755
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -81,8 +81,9 @@ KRB5_KTNAME=$K5ROOT/ovsec_adm.srvtab; export KRB5_KTNAME
 KRB5_CLIENT_KTNAME=$K5ROOT/client_keytab; export KRB5_CLIENT_KTNAME
 KRB5CCNAME=$K5ROOT/krb5cc_unit-test; export KRB5CCNAME
 
-# Make sure we don't get confused by translated messages.
-LC_MESSAGES=C; export LC_MESSAGES
+# Make sure we don't get confused by translated messages
+# or localized times.
+LC_ALL=C; export LC_ALL
 
 if [ "$TEST_SERVER" != "" ]; then
 	MAKE_KEYTAB="$MAKE_KEYTAB -server $TEST_SERVER"