ldap/servers/slapd/back-ldbm/import-threads.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3a7c7271a4972910a4250c140096cfd402e98566
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Apr 30 14:58:03 2013 -0700
Ticket #529 - dn normalization must handle multiple space characters in attributes
Fix Description: Fixing a 2 compiler warnings introduced by commit
a68952f9a8e6d3ff9fea1b4b485acc63f77b3ce6.
https://fedorahosted.org/389/ticket/529
(cherry picked from commit 5a0e057940bddd6e076186845a0cacf99c6c0143)
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c
b/ldap/servers/slapd/back-ldbm/import-threads.c
index 79a5984..3828080 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -1448,7 +1448,7 @@ upgradedn_producer(void *param)
struct upgradedn_attr *ud_ptr = NULL;
Slapi_Attr *ud_attr = NULL;
char *ecopy = NULL;
- const char *normdn = NULL;
+ char *normdn = NULL;
char *rdn = NULL; /* original rdn */
int is_dryrun = 0; /* FLAG_DRYRUN */
int chk_dn_norm = 0; /* FLAG_UPGRADEDNFORMAT */
@@ -1660,7 +1660,7 @@ upgradedn_producer(void *param)
CACHE_ADD( &inst->inst_dncache, bdn, NULL );
CACHE_RETURN(&inst->inst_dncache, &bdn);
/* don't free this normdn */
- normdn = slapi_sdn_get_dn(sdn);
+ normdn = (char *)slapi_sdn_get_dn(sdn);
slapi_log_error(SLAPI_LOG_CACHE, "uptradedn",
"entryrdn_lookup_dn returned: %s, "
"and set to dn cache\n", normdn);
@@ -1701,7 +1701,7 @@ upgradedn_producer(void *param)
*/
if (!normdn) {
/* No rdn in id2entry or entrydn */
- normdn = slapi_sdn_get_dn(&(e->e_sdn));
+ normdn = (char *)slapi_sdn_get_dn(&(e->e_sdn));
}
/*