Enable all localizations in main functions

Bite the bullet and pass LC_ALL to setlocale() instead of just
LC_MESSAGES.  Calls to setlocale() itself were introduced in
fabbf9e443459e8c0161c84563690ed70c7f6a61 for ticket 6918, but
only for LC_MESSAGES since only localized strings were needed
and that was the most conservative option.
However, klist, kadmin, and kinit (and perhaps others) would benefit
from localized formats for times (i.e., LC_TIME).  If potentially
localized data is being sent on the wire, that is a bug that should
be fixed.  No such bugs are found with the current test suite, so we
are comfortable enabling LC_ALL at this time.

ticket: 7192

diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index 176f6e2e392bfbe553373c8c64382d6c6b291c6e..2d13cd996f2fee20b152f9ac0774f32b7684529c 100644 (file)
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -81,7 +81,7 @@ main(argc, argv)
     int quiet = 0;
     int all = 0;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     progname = GET_PROGNAME(argv[0]);
 
     while ((c = getopt(argc, argv, "54Aqc:")) != -1) {

diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index 1bf7564a1299e7b4753ce1d67d7f1d9d09ffc517..b24c32abf3dbba8542d0bed38964b1afe94844bb 100644 (file)
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -820,7 +820,7 @@ main(argc, argv)
     struct k5_data k5;
     int authed_k5 = 0;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     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 ce86597ada63da5fc9cab768e4d992d6c26374e3..402858e464d11999f86616b52c0defe775450af7 100644 (file)
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -118,7 +118,7 @@ main(argc, argv)
     char *name;
     int mode;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     progname = GET_PROGNAME(argv[0]);
 
     name = NULL;

diff --git a/src/clients/kpasswd/kpasswd.c b/src/clients/kpasswd/kpasswd.c
index 7aed0f1ac898656aae43ae6778628b8624996ed4..4fc773e6b56cedb3aecb77a7c98880daa29e161b 100644 (file)
--- a/src/clients/kpasswd/kpasswd.c
+++ b/src/clients/kpasswd/kpasswd.c
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     int result_code;
     krb5_data result_code_string, result_string;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     if (argc > 2) {
         fprintf(stderr, _("usage: %s [principal]\n"), argv[0]);
         exit(1);

diff --git a/src/clients/kswitch/kswitch.c b/src/clients/kswitch/kswitch.c
index 42cc9d66440b7d3c4efe960c28022c26758aaef2..6c721d28866693dd2f42e47b8e967fa4060c3e74 100644 (file)
--- a/src/clients/kswitch/kswitch.c
+++ b/src/clients/kswitch/kswitch.c
@@ -57,7 +57,7 @@ main(int argc, char **argv)
     const char *cache_name = NULL, *princ_name = NULL;
     krb5_boolean errflag = FALSE;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     progname = GET_PROGNAME(argv[0]);
 
     while ((c = getopt(argc, argv, "c:p:")) != -1) {

diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index 6a58d01f60996e844a9371dcdc2f6136f01095e1..9b4f2050d48ad278b4e238ba89d9e0bf29506699 100644 (file)
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
     char *sname = NULL, *for_user = NULL;
     int canon = 0, unknown = 0, proxy = 0;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     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 f86c215f0485df127f7d624df2afded46c2db33d..bf884d1ecff38861b0113c9d779f6f8ead82233b 100644 (file)
--- 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 df9c080a053468fe9e8dadfb4c29ddd49da5e5c4..e4d8d6c51525563daac8bb74b3970447850639f2 100644 (file)
--- 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 c1106b156b5ea6863970138c42f6dbc55062f5ee..a969a463371cf15392ca84c8926ac424599835bd 100644 (file)
--- 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 6859144cae12dc98e420dbb245b861ea55b00d9f..0976a8ad44a01206d14934e456f9bf62f81de83e 100644 (file)
--- 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 de1578b569e2f21ca2784ae391c6ba0cf1cc1eed..11d018a503bad37ab7040ce1538885f81b3b6a8d 100755 (executable)
--- 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"

diff --git a/src/kdc/main.c b/src/kdc/main.c
index b119dd53ad53857d3d4743c4ab4218e1c21ddcef..4c8bf883ddeeae57f70a0c9dad106003e6bb1c22 100644 (file)
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -974,7 +974,7 @@ int main(int argc, char **argv)
     int errout = 0;
     int i;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     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 6c81083fed0566111c7078d33dd27a2f5f90e0fc..6fb458d0fffa850657c8d2e7306855d095771860 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
@@ -261,7 +261,7 @@ main(int argc, char *argv[])
     /*
      * Ensure that "progname" is set before calling com_err.
      */
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     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 7f2bc00d68aec7624d17bf95041e966c38f19108..a8c55f3d95bfe88b437a93af5af6ab09003297c8 100644 (file)
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -97,7 +97,7 @@ main(argc, argv)
     krb5_creds *my_creds;
     krb5_auth_context auth_context;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     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 14304c4fb559a45f0b641cee7ccfa42d210b79dd..c3ac3a8034dac651194eb31a788414695a6c689b 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -191,7 +191,7 @@ main(argc, argv)
     int ret = 0;
     kdb_log_context *log_ctx;
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
     PRS(argv);
 
     log_ctx = kpropd_context->kdblog_context;

diff --git a/src/slave/kproplog.c b/src/slave/kproplog.c
index e8aac1e8ebaed0125a5098f6da2cf7102f243232..b97604abc2144c9b1d8203280c0191503dc42622 100644 (file)
--- 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 */
 
-    setlocale(LC_MESSAGES, "");
+    setlocale(LC_ALL, "");
 
 #if !defined(TEXT_DOMAIN)
 #define TEXT_DOMAIN "SYS_TEST"

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 192ac6da9f9647e115bc268abf8c41a24f489b6f..c906bf1090f00d35830ae89170cdf7ed74463d1d 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -643,9 +643,10 @@ foreach i $runvarlist {
        verbose "savelist $envvars_tosave"
        lappend krb5_init_vars $i
     }
-    # Make sure we don't get confused by translated messages.
-    lappend envvars_tosave "LC_MESSAGES"
-    lappend krb5_init_vars "LC_MESSAGES=C"
+    # Make sure we don't get confused by translated messages
+    # or localized times.
+    lappend envvars_tosave "LC_ALL"
+    lappend krb5_init_vars "LC_ALL=C"
 }
 set envstackp 0
 envstack_push

diff --git a/src/tests/misc/test_chpw_message.c b/src/tests/misc/test_chpw_message.c
index aef96b13f345dbe656959c914be7d979e70a1525..ba6fa187fa1e163bb324e0254ed87b1a07d57d86 100644 (file)
--- a/src/tests/misc/test_chpw_message.c
+++ b/src/tests/misc/test_chpw_message.c
@@ -116,7 +116,7 @@ main(void)
     krb5_context context;
     char *msg;
 
-    setlocale(LC_MESSAGES, "C");
+    setlocale(LC_ALL, "C");
 
     check(krb5_init_context(&context));
 

diff --git a/src/util/k5test.py b/src/util/k5test.py
index c5669bef2998bba990e9bdcdfd86ad86e9bb81bf..b5f6d15100e3840168c3ac7cae39b5f8a97902c7 100644 (file)
--- a/src/util/k5test.py
+++ b/src/util/k5test.py
@@ -518,8 +518,9 @@ def _build_env():
             env[k] = os.path.join(buildtop, v)
         else:
             env[k] = v
-    # Make sure we don't get confused by translated messages.
-    env['LC_MESSAGES'] = 'C'
+    # Make sure we don't get confused by translated messages
+    # or localized times.
+    env['LC_ALL'] = 'C'
     return env