Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/collation
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26998
Modified Files:
collate.c
Log Message:
Resolves: #430568
Summary: spurious errors logged when specifying default locale
Description:
As Ulf Weltman pointed out, U_USING_FALLBACK_WARNING is not an error. (So is
not U_USING_DEFAULT_WARNING.) When U_USING_FALLBACK_WARNING or
U_USING_DEFAULT_WARNING is returned, suppressed printing the error messages.
Index: collate.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/collate.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- collate.c 25 Nov 2008 16:15:09 -0000 1.9
+++ collate.c 11 Dec 2008 23:33:30 -0000 1.10
@@ -456,13 +456,15 @@
slapi_ch_calloc (1, sizeof (collation_indexer_t));
ix = (indexer_t*) slapi_ch_calloc (1, sizeof (indexer_t));
ucol_setAttribute (coll, UCOL_STRENGTH, profile->strength, &err);
- if (err != U_ZERO_ERROR) {
+ if (err != U_ZERO_ERROR && err != U_USING_FALLBACK_WARNING
+ && (err != U_USING_DEFAULT_WARNING || !is_default)) {
LDAPDebug (LDAP_DEBUG_ANY, "collation_indexer_create: could not "
"set the collator strength for oid %s to %d: err %d\n",
oid, profile->strength, err);
}
ucol_setAttribute (coll, UCOL_DECOMPOSITION_MODE, profile->decomposition,
&err);
- if (err != U_ZERO_ERROR) {
+ if (err != U_ZERO_ERROR && err != U_USING_FALLBACK_WARNING
+ && (err != U_USING_DEFAULT_WARNING || !is_default)) {
LDAPDebug (LDAP_DEBUG_ANY, "collation_indexer_create: could not "
"set the collator decomposition mode for oid %s to %d: err %d\n",
oid, profile->decomposition, err);