Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nadezhda Ivanova
OpenLDAP
Commits
79f7c850
Commit
79f7c850
authored
Feb 22, 1999
by
Hallvard Furuseth
Browse files
Add locale support (slapd.conf keyword "locale") to slapd if HAVE_LOCALE_H
parent
246e269a
Changes
7
Hide whitespace changes
Inline
Side-by-side
configure
View file @
79f7c850
...
...
@@ -7988,6 +7988,7 @@ for ac_hdr in \
getopt.h
\
libutil.h
\
limits.h
\
locale.h
\
malloc.h
\
memory.h
\
regex.h
\
...
...
configure.in
View file @
79f7c850
...
...
@@ -1404,6 +1404,7 @@ AC_CHECK_HEADERS( \
getopt.h \
libutil.h \
limits.h \
locale.h \
malloc.h \
memory.h \
regex.h \
...
...
doc/man/man5/slapd.conf.5
View file @
79f7c850
...
...
@@ -124,6 +124,17 @@ 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
...
...
@@ -354,6 +365,7 @@ ETCDIR/slapd.conf
.SH SEE ALSO
.BR ldap (3),
.BR slapd.replog (5),
.BR locale (5),
.BR passwd (5),
.BR slapd (8),
.BR slurpd (8),
...
...
include/portable.h.in
View file @
79f7c850
...
...
@@ -411,6 +411,9 @@
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define if you have the <lwp/lwp.h> header file. */
#undef HAVE_LWP_LWP_H
...
...
include/portable.h.nt
View file @
79f7c850
...
...
@@ -456,6 +456,9 @@ typedef char * caddr_t;
/* Define if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
/* Define if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
/* Define if you have the <lwp/lwp.h> header file. */
/* #undef HAVE_LWP_LWP_H */
...
...
servers/slapd/config.c
View file @
79f7c850
...
...
@@ -3,6 +3,9 @@
#include
"portable.h"
#include
<stdio.h>
#ifdef HAVE_LOCALE_H
#include
<locale.h>
#endif
#include
<ac/string.h>
#include
<ac/ctype.h>
...
...
@@ -309,6 +312,35 @@ read_config( char *fname )
strcpy
(
default_referral
,
"Referral:
\n
"
);
strcat
(
default_referral
,
cargv
[
1
]
);
/* 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 objectclass */
}
else
if
(
strcasecmp
(
cargv
[
0
],
"objectclass"
)
==
0
)
{
parse_oc
(
be
,
fname
,
lineno
,
cargc
,
cargv
);
...
...
servers/slapd/tools/centipede.c
View file @
79f7c850
...
...
@@ -502,9 +502,7 @@ generate_new_centroids(
/* normalize the value */
for
(
s
=
val
[
j
];
*
s
;
s
++
)
{
if
(
isascii
(
*
s
)
)
{
*
s
=
TOLOWER
(
*
s
);
}
*
s
=
TOLOWER
(
(
unsigned
char
)
*
s
);
last
=
*
s
;
}
if
(
isascii
(
last
)
&&
isdigit
(
last
)
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment