Add setlocale() calls to main functions

ticket: 6918

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24963 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index fe5ecacf6b705c6cb2f01317c8cea4bfc486368e..73ce04459b506b4425d91561fcac801ee469ca93 100644 (file)
--- 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 682dc64704bbe85b40b32840c505d17fa419ddaa..802229ae002fa8dce588293142659f11d2a9f432 100644 (file)
--- 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 1ecc5f8d81aa3221ab2d417573f0ecda62bc67d7..d191f85c820cf359bc6f4f3c9bf8195d9a24c622 100644 (file)
--- 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 27325cc6df3d8f1d830b991d9763a8ec86ebca3e..b4b6eadd4d0c053e1f7973a80d44731129bc958b 100644 (file)
--- 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 9173daa76922d207979b3479dffcd35e24317a53..74ecf58a8e993d7b5af507448dadf47df8eae6f2 100644 (file)
--- 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 bde9b156127d880989561f816f5e05f58e4bad36..f86c215f0485df127f7d624df2afded46c2db33d 100644 (file)
--- 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 7f5d6746b442bc8cb2480c75c3d4c5410b29957c..70a04e259261d8ce8938e62007110ffb4aa7ad9b 100644 (file)
--- 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 7fe15449e37597744d28336b70fe59ce56f0d4fc..c1106b156b5ea6863970138c42f6dbc55062f5ee 100644 (file)
--- 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 8c11480e8b5672a71de1cb8ad1bbba5437cead24..04d8c4b841575201dab7fbd2851813a60eea0160 100644 (file)
--- 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 b2a52dd1a5d4163bb30347fe4611a508ad0756e3..e2446cdd0a0fd9c17c633c279f23ef768e6ba00d 100644 (file)
--- 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 022b94f80d41ee7ca72626822452e687834d8e97..6c81083fed0566111c7078d33dd27a2f5f90e0fc 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,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 1aa78773b1cdc82abe4247a3b7c8989c5db2d679..f1b676fb8ac50143097b2f07e6e8157060836078 100644 (file)
--- 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 58486bb28d243a872f5cae95967e7efb51d2889c..259d633681248c339e56b2e2b80a77cbd8ea2ba4 100644 (file)
--- 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 0af30d92cba9f9aa9633287b6023982c0ab58fa9..e8aac1e8ebaed0125a5098f6da2cf7102f243232 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 */
 
-    (void) setlocale(LC_ALL, "");
+    setlocale(LC_MESSAGES, "");
 
 #if !defined(TEXT_DOMAIN)
 #define TEXT_DOMAIN "SYS_TEST"