- int i, dnLength;
-
- dnLength = strlen ( dn );
- op->o_suffix = NULL;
- op->o_suffixAliased = NULL;
- for ( i = 0;
- be->be_suffixAlias != NULL && be->be_suffixAlias[i] != NULL;
- i += 2) {
- int aliasLength = strlen (be->be_suffixAlias[i]);
- if (aliasLength > dnLength) {
- continue;
- }
-
- if (!strcasecmp(be->be_suffixAlias[i],
- dn + (dnLength - aliasLength))) {
- char *oldDN = dn;
- op->o_suffixAliased = strdup ( be->be_suffixAlias[i] );
- dn = ch_malloc ( (dnLength - aliasLength) +
- strlen (be->be_suffixAlias[ i+1 ]) + 1);
- strncpy (dn, oldDN, dnLength - aliasLength);
- strcpy (dn + (dnLength - aliasLength), be->be_suffixAlias[ i+1 ]);
- op->o_suffix = strdup (dn);
- Debug( LDAP_DEBUG_ARGS, "ALIAS: converted %s to %s", oldDN, dn, 0);
- free (oldDN);
+ int i, dnLength;
+
+ if(dn == NULL || be == NULL || dn->bv_len == 0)
+ return;
+
+ dnLength = dn->bv_len;
+
+ for ( i = 0;
+ be->be_suffixAlias != NULL && be->be_suffixAlias[i].bv_val != NULL;
+ i += 2 )
+ {
+ int aliasLength = be->be_suffixAlias[i].bv_len;
+ int diff = dnLength - aliasLength;
+
+ if ( diff < 0 ) {
+ /* alias is longer than dn */
+ continue;
+ } else if ( diff > 0 ) {
+ if ( ! DN_SEPARATOR(dn->bv_val[diff-1]) ) {
+ /* boundary is not at a DN separator */
+ continue;
+ }
+ /* At a DN Separator */
+ /* XXX or an escaped separator... oh well */
+ }
+
+ if (!strcmp(be->be_suffixAlias[i].bv_val, &dn->bv_val[diff])) {
+ char *oldDN = dn->bv_val;
+ dn->bv_len = diff + be->be_suffixAlias[i+1].bv_len;
+ dn->bv_val = ch_malloc( dn->bv_len + 1 );
+ strncpy( dn->bv_val, oldDN, diff );
+ strcpy( &dn->bv_val[diff], be->be_suffixAlias[i+1].bv_val );
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO,
+ "suffix_alias: converted \"%s\" to \"%s\"\n",
+ oldDN, dn->bv_val, 0 );
+#else
+ Debug( LDAP_DEBUG_ARGS,
+ "suffix_alias: converted \"%s\" to \"%s\"\n",
+ oldDN, dn->bv_val, 0);
+#endif
+
+ free (oldDN);