remove locale option. OpenLDAP is designed only for the "C" locale.

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 09a15f41d86777f797bf58f4fca080b2ce828762..14d95a89373f87e426d789839452ec46f84183f3 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -138,17 +138,6 @@ The ( absolute ) name of a file that will hold the
 server's command line options
 if started without the debugging command line option.
 .TP
-.B
-locale { <locale-name> | on | off }
-Obey <locale-name>'s character classification and case conversion; i.e. the
-.BR locale (5)
-LC_CTYPE category.  See
-.BR locale (5)
-for details about locales.  "on" takes the locale from the environment,
-typically $LANG or $LC_CTYPE, and will only work properly if slapd will
-run with the same environment variables as when the database was
-generated.  "off" (the default setting) resets to the initial "C" locale.
-.TP
 .B loglevel <integer>
 Specify the level at which debugging statements and operation 
 statistics should be syslogged (currently logged to the

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 9f78b99911eef351d616512057ce98073c134065..f5041fe0070dc9dca5c9761f122ab85e1cbb9a21 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -8,9 +8,6 @@
 #include "portable.h"
 
 #include <stdio.h>
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
 
 #include <ac/string.h>
 #include <ac/ctype.h>
@@ -436,35 +433,6 @@ read_config( const char *fname )
                        vals[0]->bv_len = strlen( vals[0]->bv_val );
                        value_add( &default_referral, vals );
 
-               /* specify locale */
-               } else if ( strcasecmp( cargv[0], "locale" ) == 0 ) {
-#ifdef HAVE_LOCALE_H
-                       char *locale;
-                       if ( cargc < 2 ) {
-                               Debug( LDAP_DEBUG_ANY,
-       "%s: line %d: missing locale in \"locale <name | on | off>\" line\n",
-                                      fname, lineno, 0 );
-                               return( 1 );
-                       }
-
-                       locale = (strcasecmp(   cargv[1], "on"  ) == 0 ? ""
-                                 : strcasecmp( cargv[1], "off" ) == 0 ? "C"
-                                 : ch_strdup( cargv[1] )                    );
-
-                       if ( setlocale( LC_CTYPE, locale ) == 0 ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                      (*locale
-                                       ? "%s: line %d: bad locale \"%s\"\n"
-                                       : "%s: line %d: bad locale\n"),
-                                      fname, lineno, locale );
-                               return( 1 );
-                       }
-#else
-                       Debug( LDAP_DEBUG_ANY,
-                              "%s: line %d: \"locale\" unsupported\n",
-                              fname, lineno, 0 );
-                       return( 1 );
-#endif
                /* specify an Object Identifier macro */
                } else if ( strcasecmp( cargv[0], "objectidentifier" ) == 0 ) {
                        parse_oidm( fname, lineno, cargc, cargv );