Allow using locales when gettext is absent

Previously, if configure did not detect dgettext(), we disabled
anything that smelled like localization, inadvertently including
setlocale().  Now that we use setlocale(LC_ALL, ""), we have
localized dates available as well as messages, so we should not
disable calls to setlocale() any more.
Since the routines from locale.h are only used in a relatively
small number of places, just include the header directly in those
files and remove it from k5-platform.h.

diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index 2d13cd996f2fee20b152f9ac0774f32b7684529c..299838ff555a2645d2e71345b8c6d9313af5fd48 100644 (file)
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -27,6 +27,7 @@
 #include "k5-platform.h"
 #include <krb5.h>
 #include <com_err.h>
+#include <locale.h>
 #include <string.h>
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H

diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index b24c32abf3dbba8542d0bed38964b1afe94844bb..dcec9b76625e3d9ecab8fd8108fe066c8e553474 100644 (file)
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -28,6 +28,7 @@
 #include "k5-platform.h"        /* for asprintf */
 #include <krb5.h>
 #include "extern.h"
+#include <locale.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>

diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index 402858e464d11999f86616b52c0defe775450af7..fefd895d18d8569258d6ba20b68d0252353505f2 100644 (file)
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -27,6 +27,7 @@
 #include "k5-int.h"
 #include <krb5.h>
 #include <com_err.h>
+#include <locale.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/clients/kpasswd/kpasswd.c b/src/clients/kpasswd/kpasswd.c
index 4fc773e6b56cedb3aecb77a7c98880daa29e161b..9f4952bb82d8b4a1835b8519118a7305cf0d6264 100644 (file)
--- a/src/clients/kpasswd/kpasswd.c
+++ b/src/clients/kpasswd/kpasswd.c
@@ -1,4 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+#include <locale.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include "k5-platform.h"

diff --git a/src/clients/kswitch/kswitch.c b/src/clients/kswitch/kswitch.c
index 6c721d28866693dd2f42e47b8e967fa4060c3e74..b64947972cd07ed7afc30c02c0c0a32a3c5c1b8b 100644 (file)
--- a/src/clients/kswitch/kswitch.c
+++ b/src/clients/kswitch/kswitch.c
@@ -24,6 +24,7 @@
  * or implied warranty.
  */
 
+#include <locale.h>
 #include "k5-int.h"
 
 extern int optind;

diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index 9b4f2050d48ad278b4e238ba89d9e0bf29506699..134accbd7b3badb60e407ddd3a6be9043c384912 100644 (file)
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -25,6 +25,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "k5-platform.h"

diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index 951652497b02b8a64270b7488f49896ae6a2df56..c9272911792d13cc060af1e9cd1c80116d6c68f4 100644 (file)
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -41,7 +41,7 @@
  * + mkstemp
  * + zap (support function; macro is in k5-int.h)
  * + path manipulation
- * + _, N_, dgettext, bindtextdomain, setlocale (for localization)
+ * + _, N_, dgettext, bindtextdomain (for localization)
  */
 
 #ifndef K5_PLATFORM_H
@@ -1061,13 +1061,12 @@ int k5_path_isabs(const char *path);
 
 /*
  * Localization macros.  If we have gettext, define _ appropriately for
- * translating a string.  If we do not have gettext, define _, bindtextdomain,
- * and setlocale as no-ops.  N_ is always a no-op; it marks a string for
+ * translating a string.  If we do not have gettext, define _ and
+ * bindtextdomain as no-ops.  N_ is always a no-op; it marks a string for
  * extraction to pot files but does not translate it.
  */
 #ifdef ENABLE_NLS
 #include <libintl.h>
-#include <locale.h>
 #define KRB5_TEXTDOMAIN "mit-krb5"
 #define _(s) dgettext(KRB5_TEXTDOMAIN, s)
 #else
@@ -1075,7 +1074,6 @@ int k5_path_isabs(const char *path);
 #define dgettext(d, m) m
 #define ngettext(m1, m2, n) (((n) == 1) ? m1 : m2)
 #define bindtextdomain(p, d)
-#define setlocale(c, l)
 #endif
 #define N_(s) s
 

diff --git a/src/kadmin/cli/ss_wrapper.c b/src/kadmin/cli/ss_wrapper.c
index bf884d1ecff38861b0113c9d779f6f8ead82233b..54f56716bbf274199a696333c88d9ebca5901c9d 100644 (file)
--- a/src/kadmin/cli/ss_wrapper.c
+++ b/src/kadmin/cli/ss_wrapper.c
@@ -25,6 +25,7 @@
 
 #include <krb5.h>
 #include <k5-platform.h>
+#include <locale.h>
 #include <ss/ss.h>
 #include "kadmin.h"
 

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index e4d8d6c51525563daac8bb74b3970447850639f2..ca1cdd29493a28731905ea07747caf153c484526 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -56,6 +56,7 @@
 #include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
+#include <locale.h>
 #include <adm_proto.h>
 #include <time.h>
 #include "kdb5_util.h"

diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index a969a463371cf15392ca84c8926ac424599835bd..ef16d37a5693c4d2029704f5904fa724364e48ca 100644 (file)
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -27,6 +27,7 @@
 #include "k5-int.h"
 #include "ktutil.h"
 #include <com_err.h>
+#include <locale.h>
 #include "adm_proto.h"
 #include <ss/ss.h>
 #include <stdio.h>

diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 0976a8ad44a01206d14934e456f9bf62f81de83e..dbb90cb2055f5b8911076e371087638deff1e08b 100644 (file)
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -31,6 +31,7 @@
  */
 
 #include    <errno.h>
+#include    <locale.h>
 #include    <stdio.h>
 #include    <signal.h>
 #include    <syslog.h>

diff --git a/src/kdc/main.c b/src/kdc/main.c
index 4c8bf883ddeeae57f70a0c9dad106003e6bb1c22..7f779697f3ddb87cf436d4f9ada6edc7ede009c8 100644 (file)
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -50,6 +50,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <locale.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <signal.h>

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 6fb458d0fffa850657c8d2e7306855d095771860..c5f286315e10e1d08664145376420e490d884e40 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
@@ -75,6 +75,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <locale.h>
 #include <stdio.h>
 #include <time.h>
 

diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index a8c55f3d95bfe88b437a93af5af6ab09003297c8..540d14bfd656a834430418a83d82f1c8e226f616 100644 (file)
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -25,6 +25,7 @@
  */
 
 #include <errno.h>
+#include <locale.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/file.h>

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index c3ac3a8034dac651194eb31a788414695a6c689b..aa6e979ed9fdac8528f01d4719e56f0a3608afd3 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -60,6 +60,7 @@
  */
 
 
+#include <locale.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/file.h>

diff --git a/src/slave/kproplog.c b/src/slave/kproplog.c
index b97604abc2144c9b1d8203280c0191503dc42622..e58ca2078317bf73a1679d9c0ba50d179a9c4bb9 100644 (file)
--- a/src/slave/kproplog.c
+++ b/src/slave/kproplog.c
@@ -10,6 +10,7 @@
  * This module will parse the update logs on the master or slave servers.
  */
 
+#include <locale.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>