diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2008-12-11 23:33:30 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2008-12-11 23:33:30 +0000 |
| commit | 9b2bfe9d64ecd248fc1abc4ae87d117b0642dace (patch) | |
| tree | 4b06b19d5c624493146d7393c728b38267b74b46 | |
| parent | ea1286557f9aab2e3891f14fbbd103f1734662fb (diff) | |
| download | ds-9b2bfe9d64ecd248fc1abc4ae87d117b0642dace.tar.gz ds-9b2bfe9d64ecd248fc1abc4ae87d117b0642dace.tar.xz ds-9b2bfe9d64ecd248fc1abc4ae87d117b0642dace.zip | |
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.
| -rw-r--r-- | ldap/servers/plugins/collation/collate.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ldap/servers/plugins/collation/collate.c b/ldap/servers/plugins/collation/collate.c index 06bb556a..0314469d 100644 --- a/ldap/servers/plugins/collation/collate.c +++ b/ldap/servers/plugins/collation/collate.c @@ -456,13 +456,15 @@ collation_indexer_create (const char* oid) 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); |