mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix !ENABLE_REWRITE

Browse Source
This commit is contained in:
Howard Chu 2003-04-07 19:48:10 +00:00
parent 3c704f4d14
commit cd76391078
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/back-ldap/config.c
View File

@ -221,11 +221,11 @@ ldap_back_db_config(
return( rc );
#else /* !ENABLE_REWRITE */
ber_bvarray_add( &li->suffix_massage, &pvnc );
ber_bvarray_add( &li->suffix_massage, &nvnc );
ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &pvnc );
ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &nvnc );
ber_bvarray_add( &li->suffix_massage, &prnc );
ber_bvarray_add( &li->suffix_massage, &nrnc );
ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &prnc );
ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &nrnc );
#endif /* !ENABLE_REWRITE */
/* rewrite stuff ... */

4
servers/slapd/back-ldap/init.c
View File

@ -197,8 +197,8 @@ ldap_back_db_destroy(
rewrite_info_delete( li->rwmap.rwm_rw );
}
#else /* !ENABLE_REWRITE */
if (li->suffix_massage) {
ber_bvarray_free( li->suffix_massage );
if (li->rwmap.rwm_suffix_massage) {
ber_bvarray_free( li->rwmap.rwm_suffix_massage );
}
#endif /* !ENABLE_REWRITE */

12
servers/slapd/back-ldap/suffixmassage.c
View File

@ -107,7 +107,7 @@ ldap_back_dn_massage(
res->bv_len = 0;
return 0;
}
if ( dc->li == NULL || dc->li->suffix_massage == NULL ) {
if ( dc->rwmap == NULL || dc->rwmap->rwm_suffix_massage == NULL ) {
*res = *dn;
return 0;
}
@ -126,9 +126,9 @@ ldap_back_dn_massage(
}
for ( i = 0;
dc->li->suffix_massage[i].bv_val != NULL;
dc->rwmap->rwm_suffix_massage[i].bv_val != NULL;
i += 4 ) {
int aliasLength = dc->li->suffix_massage[i+src].bv_len;
int aliasLength = dc->rwmap->rwm_suffix_massage[i+src].bv_len;
int diff = dn->bv_len - aliasLength;
if ( diff < 0 ) {
@ -140,11 +140,11 @@ ldap_back_dn_massage(
/* At a DN Separator */
}
if ( !strcmp( dc->li->suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
res->bv_len = diff + dc->li->suffix_massage[i+dst].bv_len;
if ( !strcmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
res->bv_len = diff + dc->rwmap->rwm_suffix_massage[i+dst].bv_len;
res->bv_val = ch_malloc( res->bv_len + 1 );
strncpy( res->bv_val, dn->bv_val, diff );
strcpy( &res->bv_val[diff], dc->li->suffix_massage[i+dst].bv_val );
strcpy( &res->bv_val[diff], dc->rwmap->rwm_suffix_massage[i+dst].bv_val );
#ifdef NEW_LOGGING
LDAP_LOG ( BACK_LDAP, ARGS,
"ldap_back_dn_massage: converted \"%s\" to \"%s\"\n",