diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2012-07-05 14:56:50 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-07-06 14:06:12 -0400 |
| commit | 75c7c600b49a7f1d5cf95260fc073cb4ba5929cd (patch) | |
| tree | 46bcba94693b0171533a55a7d0eee54c0bf35306 /src/kadmin | |
| parent | 1df4d98ca14d884808b1d4f746edd4c7f55dbd7e (diff) | |
| download | krb5-75c7c600b49a7f1d5cf95260fc073cb4ba5929cd.tar.gz krb5-75c7c600b49a7f1d5cf95260fc073cb4ba5929cd.tar.xz krb5-75c7c600b49a7f1d5cf95260fc073cb4ba5929cd.zip | |
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
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/cli/ss_wrapper.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.c | 2 | ||||
| -rw-r--r-- | src/kadmin/ktutil/ktutil.c | 2 | ||||
| -rw-r--r-- | src/kadmin/server/ovsec_kadmd.c | 2 | ||||
| -rwxr-xr-x | src/kadmin/testing/scripts/env-setup.shin | 5 |
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" |