]> git.sur5r.net Git - openldap/commitdiff
inherit from back-ldap
authorPierangelo Masarati <ando@openldap.org>
Sat, 13 Nov 2004 18:36:02 +0000 (18:36 +0000)
committerPierangelo Masarati <ando@openldap.org>
Sat, 13 Nov 2004 18:36:02 +0000 (18:36 +0000)
servers/slapd/back-meta/Makefile.in
servers/slapd/back-meta/map.c [new file with mode: 0644]
servers/slapd/back-meta/suffixmassage.c [new file with mode: 0644]

index 2b31e51000b68c57a51c14c27546a037f44508af..193bcb65420afd3669cc1658862a8c9ac2532a24 100644 (file)
 ## <http://www.OpenLDAP.org/license.html>.
 
 SRCS   = init.c config.c search.c bind.c unbind.c add.c compare.c \
-               delete.c modify.c modrdn.c \
+               delete.c modify.c modrdn.c suffixmassage.c map.c \
                conn.c candidates.c dncache.c
 OBJS   = init.lo config.lo search.lo bind.lo unbind.lo add.lo compare.lo \
-               delete.lo modify.lo modrdn.lo \
+               delete.lo modify.lo modrdn.lo suffixmassage.lo map.lo \
                conn.lo candidates.lo dncache.lo
 
 LDAP_INCDIR= ../../../include       
diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
new file mode 100644 (file)
index 0000000..e6a6c7b
--- /dev/null
@@ -0,0 +1,582 @@
+/* map.c - ldap backend mapping routines */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
+ */
+/* This is an altered version */
+/*
+ * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
+ * 
+ * Permission is granted to anyone to use this software for any purpose
+ * on any computer system, and to alter it and redistribute it, subject
+ * to the following restrictions:
+ * 
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ * 
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits should appear in the documentation.
+ * 
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits should appear in the documentation.
+ * 
+ * 4. This notice may not be removed or altered.
+ *
+ *
+ *
+ * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ * 
+ * This software is being modified by Pierangelo Masarati.
+ * The previously reported conditions apply to the modified code as well.
+ * Changes in the original code are highlighted where required.
+ * Credits for the original code go to the author, Howard Chu.
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
+#include "slap.h"
+#include "../back-ldap/back-ldap.h"
+#include "back-meta.h"
+
+#undef ldap_debug      /* silence a warning in ldap-int.h */
+#include "../../../libraries/libldap/ldap-int.h"
+
+int
+mapping_cmp ( const void *c1, const void *c2 )
+{
+       struct ldapmapping *map1 = (struct ldapmapping *)c1;
+       struct ldapmapping *map2 = (struct ldapmapping *)c2;
+       int rc = map1->src.bv_len - map2->src.bv_len;
+       if (rc) return rc;
+       return ( strcasecmp(map1->src.bv_val, map2->src.bv_val) );
+}
+
+int
+mapping_dup ( void *c1, void *c2 )
+{
+       struct ldapmapping *map1 = (struct ldapmapping *)c1;
+       struct ldapmapping *map2 = (struct ldapmapping *)c2;
+
+       return( ( strcasecmp(map1->src.bv_val, map2->src.bv_val) == 0 ) ? -1 : 0 );
+}
+
+void
+ldap_back_map_init ( struct ldapmap *lm, struct ldapmapping **m )
+{
+       struct ldapmapping *mapping;
+
+       assert( m );
+
+       *m = NULL;
+       
+       mapping = (struct ldapmapping *)ch_calloc( 2, 
+                       sizeof( struct ldapmapping ) );
+       if ( mapping == NULL ) {
+               return;
+       }
+
+       ber_str2bv( "objectclass", sizeof("objectclass")-1, 1, &mapping->src);
+       ber_dupbv( &mapping->dst, &mapping->src );
+       mapping[1].src = mapping->src;
+       mapping[1].dst = mapping->dst;
+
+       avl_insert( &lm->map, (caddr_t)mapping, 
+                       mapping_cmp, mapping_dup );
+       avl_insert( &lm->remap, (caddr_t)&mapping[1], 
+                       mapping_cmp, mapping_dup );
+       *m = mapping;
+}
+
+void
+ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *bv,
+       int remap )
+{
+       Avlnode *tree;
+       struct ldapmapping *mapping, fmapping;
+
+       if (remap == BACKLDAP_REMAP)
+               tree = map->remap;
+       else
+               tree = map->map;
+
+       bv->bv_len = 0;
+       bv->bv_val = NULL;
+       fmapping.src = *s;
+       mapping = (struct ldapmapping *)avl_find( tree, (caddr_t)&fmapping, mapping_cmp );
+       if (mapping != NULL) {
+               if ( mapping->dst.bv_val )
+                       *bv = mapping->dst;
+               return;
+       }
+
+       if (!map->drop_missing)
+               *bv = *s;
+
+       return;
+}
+
+int
+ldap_back_map_attrs(
+               struct ldapmap *at_map,
+               AttributeName *an,
+               int remap,
+               char ***mapped_attrs
+)
+{
+       int i, j;
+       char **na;
+       struct berval mapped;
+
+       if (an == NULL) {
+               *mapped_attrs = NULL;
+               return LDAP_SUCCESS;
+       }
+
+       for (i = 0; an[i].an_name.bv_val; i++) {
+               /*  */
+       }
+
+       na = (char **)ch_calloc( i + 1, sizeof(char *) );
+       if (na == NULL) {
+               *mapped_attrs = NULL;
+               return LDAP_NO_MEMORY;
+       }
+
+       for (i = j = 0; an[i].an_name.bv_val; i++) {
+               ldap_back_map(at_map, &an[i].an_name, &mapped, remap);
+               if (mapped.bv_val != NULL && mapped.bv_val != '\0')
+                       na[j++] = mapped.bv_val;
+       }
+       if (j == 0 && i != 0)
+               na[j++] = LDAP_NO_ATTRS;
+       na[j] = NULL;
+
+       *mapped_attrs = na;
+       return LDAP_SUCCESS;
+}
+
+int
+map_attr_value(
+               dncookie                *dc,
+               AttributeDescription    *ad,
+               struct berval           *mapped_attr,
+               struct berval           *value,
+               struct berval           *mapped_value,
+               int                     remap )
+{
+       struct berval           vtmp;
+       int                     freeval = 0;
+
+       ldap_back_map( &dc->rwmap->rwm_at, &ad->ad_cname, mapped_attr, remap );
+       if ( mapped_attr->bv_val == NULL || mapped_attr->bv_val[0] == '\0') {
+               /*
+                * FIXME: are we sure we need to search oc_map if at_map fails?
+                */
+               ldap_back_map( &dc->rwmap->rwm_oc, &ad->ad_cname, mapped_attr, remap );
+               if ( mapped_attr->bv_val == NULL || mapped_attr->bv_val[0] == '\0' ) {
+                       *mapped_attr = ad->ad_cname;
+               }
+       }
+
+       if ( value == NULL ) {
+               return 0;
+       }
+
+       if ( ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName )
+       {
+               dncookie fdc = *dc;
+
+#ifdef ENABLE_REWRITE
+               fdc.ctx = "searchFilter";
+#endif
+
+               switch ( ldap_back_dn_massage( &fdc, value, &vtmp ) ) {
+               case LDAP_SUCCESS:
+                       if ( vtmp.bv_val != value->bv_val ) {
+                               freeval = 1;
+                       }
+                       break;
+               
+               case LDAP_UNWILLING_TO_PERFORM:
+                       return -1;
+
+               case LDAP_OTHER:
+                       return -1;
+               }
+
+       } else if ( ad == slap_schema.si_ad_objectClass || ad == slap_schema.si_ad_structuralObjectClass ) {
+               ldap_back_map( &dc->rwmap->rwm_oc, value, &vtmp, remap );
+               if ( vtmp.bv_val == NULL || vtmp.bv_val[0] == '\0' ) {
+                       vtmp = *value;
+               }
+               
+       } else {
+               vtmp = *value;
+       }
+
+       filter_escape_value( &vtmp, mapped_value );
+
+       if ( freeval ) {
+               ber_memfree( vtmp.bv_val );
+       }
+       
+       return 0;
+}
+
+int
+ldap_back_filter_map_rewrite(
+               dncookie                *dc,
+               Filter                  *f,
+               struct berval           *fstr,
+               int                     remap )
+{
+       int             i;
+       Filter          *p;
+       struct berval   atmp;
+       struct berval   vtmp;
+       ber_len_t       len;
+
+       if ( f == NULL ) {
+               ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );
+               return -1;
+       }
+
+       switch ( f->f_choice ) {
+       case LDAP_FILTER_EQUALITY:
+               if ( map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap ) )
+               {
+                       return -1;
+               }
+
+               fstr->bv_len = atmp.bv_len + vtmp.bv_len
+                       + ( sizeof("(=)") - 1 );
+               fstr->bv_val = malloc( fstr->bv_len + 1 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
+                       atmp.bv_val, vtmp.bv_val );
+
+               ber_memfree( vtmp.bv_val );
+               break;
+
+       case LDAP_FILTER_GE:
+               if ( map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap ) )
+               {
+                       return -1;
+               }
+
+               fstr->bv_len = atmp.bv_len + vtmp.bv_len
+                       + ( sizeof("(>=)") - 1 );
+               fstr->bv_val = malloc( fstr->bv_len + 1 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
+                       atmp.bv_val, vtmp.bv_val );
+
+               ber_memfree( vtmp.bv_val );
+               break;
+
+       case LDAP_FILTER_LE:
+               if ( map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap ) )
+               {
+                       return -1;
+               }
+
+               fstr->bv_len = atmp.bv_len + vtmp.bv_len
+                       + ( sizeof("(<=)") - 1 );
+               fstr->bv_val = malloc( fstr->bv_len + 1 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
+                       atmp.bv_val, vtmp.bv_val );
+
+               ber_memfree( vtmp.bv_val );
+               break;
+
+       case LDAP_FILTER_APPROX:
+               if ( map_attr_value( dc, f->f_av_desc, &atmp,
+                                       &f->f_av_value, &vtmp, remap ) )
+               {
+                       return -1;
+               }
+
+               fstr->bv_len = atmp.bv_len + vtmp.bv_len
+                       + ( sizeof("(~=)") - 1 );
+               fstr->bv_val = malloc( fstr->bv_len + 1 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
+                       atmp.bv_val, vtmp.bv_val );
+
+               ber_memfree( vtmp.bv_val );
+               break;
+
+       case LDAP_FILTER_SUBSTRINGS:
+               if ( map_attr_value( dc, f->f_sub_desc, &atmp,
+                                       NULL, NULL, remap ) )
+               {
+                       return -1;
+               }
+
+               /* cannot be a DN ... */
+
+               fstr->bv_len = atmp.bv_len + ( sizeof("(=*)") - 1 );
+               fstr->bv_val = malloc( fstr->bv_len + 128 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
+                       atmp.bv_val );
+
+               if ( f->f_sub_initial.bv_val != NULL ) {
+                       len = fstr->bv_len;
+
+                       filter_escape_value( &f->f_sub_initial, &vtmp );
+
+                       fstr->bv_len += vtmp.bv_len;
+                       fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+
+                       snprintf( &fstr->bv_val[len - 2], vtmp.bv_len + 3,
+                               /* "(attr=" */ "%s*)",
+                               vtmp.bv_val );
+
+                       ber_memfree( vtmp.bv_val );
+               }
+
+               if ( f->f_sub_any != NULL ) {
+                       for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) {
+                               len = fstr->bv_len;
+                               filter_escape_value( &f->f_sub_any[i], &vtmp );
+
+                               fstr->bv_len += vtmp.bv_len + 1;
+                               fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+
+                               snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
+                                       /* "(attr=[init]*[any*]" */ "%s*)",
+                                       vtmp.bv_val );
+                               ber_memfree( vtmp.bv_val );
+                       }
+               }
+
+               if ( f->f_sub_final.bv_val != NULL ) {
+                       len = fstr->bv_len;
+
+                       filter_escape_value( &f->f_sub_final, &vtmp );
+
+                       fstr->bv_len += vtmp.bv_len;
+                       fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+
+                       snprintf( &fstr->bv_val[len - 1], vtmp.bv_len + 3,
+                               /* "(attr=[init*][any*]" */ "%s)",
+                               vtmp.bv_val );
+
+                       ber_memfree( vtmp.bv_val );
+               }
+
+               break;
+
+       case LDAP_FILTER_PRESENT:
+               if ( map_attr_value( dc, f->f_desc, &atmp,
+                                       NULL, NULL, remap ) )
+               {
+                       return -1;
+               }
+
+               fstr->bv_len = atmp.bv_len + ( sizeof("(=*)") - 1 );
+               fstr->bv_val = malloc( fstr->bv_len + 1 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
+                       atmp.bv_val );
+               break;
+
+       case LDAP_FILTER_AND:
+       case LDAP_FILTER_OR:
+       case LDAP_FILTER_NOT:
+               fstr->bv_len = sizeof("(%)") - 1;
+               fstr->bv_val = malloc( fstr->bv_len + 128 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)",
+                       f->f_choice == LDAP_FILTER_AND ? '&' :
+                       f->f_choice == LDAP_FILTER_OR ? '|' : '!' );
+
+               for ( p = f->f_list; p != NULL; p = p->f_next ) {
+                       len = fstr->bv_len;
+
+                       if ( ldap_back_filter_map_rewrite( dc, p, &vtmp, remap ) )
+                       {
+                               return -1;
+                       }
+                       
+                       fstr->bv_len += vtmp.bv_len;
+                       fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );
+
+                       snprintf( &fstr->bv_val[len-1], vtmp.bv_len + 2, 
+                               /*"("*/ "%s)", vtmp.bv_val );
+
+                       ch_free( vtmp.bv_val );
+               }
+
+               break;
+
+       case LDAP_FILTER_EXT: {
+               if ( f->f_mr_desc ) {
+                       if ( map_attr_value( dc, f->f_mr_desc, &atmp,
+                                               &f->f_mr_value, &vtmp, remap ) )
+                       {
+                               return -1;
+                       }
+
+               } else {
+                       atmp.bv_len = 0;
+                       atmp.bv_val = "";
+                       
+                       filter_escape_value( &f->f_mr_value, &vtmp );
+               }
+                       
+
+               fstr->bv_len = atmp.bv_len +
+                       ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
+                       ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
+                       vtmp.bv_len + ( sizeof("(:=)") - 1 );
+               fstr->bv_val = malloc( fstr->bv_len + 1 );
+
+               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
+                       atmp.bv_val,
+                       f->f_mr_dnattrs ? ":dn" : "",
+                       f->f_mr_rule_text.bv_len ? ":" : "",
+                       f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
+                       vtmp.bv_val );
+               ber_memfree( vtmp.bv_val );
+               } break;
+
+       case SLAPD_FILTER_COMPUTED:
+               ber_str2bv(
+                       f->f_result == LDAP_COMPARE_FALSE ? "(?=false)" :
+                       f->f_result == LDAP_COMPARE_TRUE ? "(?=true)" :
+                       f->f_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :
+                       "(?=error)",
+                       f->f_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :
+                       f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
+                       f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
+                       sizeof("(?=error)")-1,
+                       1, fstr );
+               break;
+
+       default:
+               ber_str2bv( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr );
+               break;
+       }
+
+       return 0;
+}
+
+/*
+ * I don't like this much, but we need two different
+ * functions because different heap managers may be
+ * in use in back-ldap/meta to reduce the amount of
+ * calls to malloc routines, and some of the free()
+ * routines may be macros with args
+ */
+int
+ldap_dnattr_rewrite(
+       dncookie                *dc,
+       BerVarray               a_vals
+)
+{
+       struct berval   bv;
+       int             i, last;
+
+       for ( last = 0; a_vals[last].bv_val != NULL; last++ );
+       last--;
+
+       for ( i = 0; a_vals[i].bv_val != NULL; i++ ) {
+               switch ( ldap_back_dn_massage( dc, &a_vals[i], &bv ) ) {
+               case LDAP_UNWILLING_TO_PERFORM:
+                       /*
+                        * FIXME: need to check if it may be considered 
+                        * legal to trim values when adding/modifying;
+                        * it should be when searching (e.g. ACLs).
+                        */
+                       ch_free( a_vals[i].bv_val );
+                       if (last > i ) {
+                               a_vals[i] = a_vals[last];
+                       }
+                       a_vals[last].bv_len = 0;
+                       a_vals[last].bv_val = NULL;
+                       last--;
+                       break;
+
+               default:
+                       /* leave attr untouched if massage failed */
+                       if ( bv.bv_val && bv.bv_val != a_vals[i].bv_val ) {
+                               ch_free( a_vals[i].bv_val );
+                               a_vals[i] = bv;
+                       }
+                       break;
+               }
+       }
+       
+       return 0;
+}
+
+int
+ldap_dnattr_result_rewrite(
+       dncookie                *dc,
+       BerVarray               a_vals
+)
+{
+       struct berval   bv;
+       int             i, last;
+
+       for ( last = 0; a_vals[last].bv_val; last++ );
+       last--;
+
+       for ( i = 0; a_vals[i].bv_val; i++ ) {
+               switch ( ldap_back_dn_massage( dc, &a_vals[i], &bv ) ) {
+               case LDAP_UNWILLING_TO_PERFORM:
+                       /*
+                        * FIXME: need to check if it may be considered 
+                        * legal to trim values when adding/modifying;
+                        * it should be when searching (e.g. ACLs).
+                        */
+                       LBER_FREE( &a_vals[i].bv_val );
+                       if ( last > i ) {
+                               a_vals[i] = a_vals[last];
+                       }
+                       a_vals[last].bv_val = NULL;
+                       a_vals[last].bv_len = 0;
+                       last--;
+                       break;
+
+               default:
+                       /* leave attr untouched if massage failed */
+                       if ( bv.bv_val && a_vals[i].bv_val != bv.bv_val ) {
+                               LBER_FREE( a_vals[i].bv_val );
+                               a_vals[i] = bv;
+                       }
+                       break;
+               }
+       }
+
+       return 0;
+}
+
diff --git a/servers/slapd/back-meta/suffixmassage.c b/servers/slapd/back-meta/suffixmassage.c
new file mode 100644 (file)
index 0000000..05e4ca2
--- /dev/null
@@ -0,0 +1,193 @@
+/* suffixmassage.c - massages ldap backend dns */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
+ */
+/* This is an altered version */
+
+/* 
+ * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
+ * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ * 
+ * Module back-ldap, originally developed by Howard Chu
+ *
+ * has been modified by Pierangelo Masarati. The original copyright
+ * notice has been maintained.
+ * 
+ * Permission is granted to anyone to use this software for any purpose
+ * on any computer system, and to alter it and redistribute it, subject
+ * to the following restrictions:
+ * 
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ * 
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits should appear in the documentation.
+ * 
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits should appear in the documentation.
+ * 
+ * 4. This notice may not be removed or altered.
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
+#include "slap.h"
+#include "../back-ldap/back-ldap.h"
+#include "back-meta.h"
+
+#ifdef ENABLE_REWRITE
+int
+ldap_back_dn_massage(
+       dncookie *dc,
+       struct berval *dn,
+       struct berval *res
+)
+{
+       int rc = 0;
+
+       switch (rewrite_session( dc->rwmap->rwm_rw, dc->ctx, (dn->bv_len ? dn->bv_val : ""), dc->conn, 
+                               &res->bv_val )) {
+       case REWRITE_REGEXEC_OK:
+               if ( res->bv_val != NULL ) {
+                       res->bv_len = strlen( res->bv_val );
+               } else {
+                       *res = *dn;
+               }
+#ifdef NEW_LOGGING
+               LDAP_LOG( BACK_LDAP, DETAIL1, 
+                       "[rw] %s: \"%s\" -> \"%s\"\n", dc->ctx, dn->bv_val, res->bv_val );              
+#else /* !NEW_LOGGING */
+               Debug( LDAP_DEBUG_ARGS,
+                       "[rw] %s: \"%s\" -> \"%s\"\n", dc->ctx, dn->bv_val, res->bv_val );              
+#endif /* !NEW_LOGGING */
+               rc = LDAP_SUCCESS;
+               break;
+               
+       case REWRITE_REGEXEC_UNWILLING:
+               if ( dc->rs ) {
+                       dc->rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+                       dc->rs->sr_text = "Operation not allowed";
+               }
+               rc = LDAP_UNWILLING_TO_PERFORM;
+               break;
+               
+       case REWRITE_REGEXEC_ERR:
+               if ( dc->rs ) {
+                       dc->rs->sr_err = LDAP_OTHER;
+                       dc->rs->sr_text = "Rewrite error";
+               }
+               rc = LDAP_OTHER;
+               break;
+       }
+       return rc;
+}
+
+#else
+/*
+ * ldap_back_dn_massage
+ * 
+ * Aliases the suffix; based on suffix_alias (servers/slapd/suffixalias.c).
+ */
+int
+ldap_back_dn_massage(
+       dncookie *dc,
+       struct berval *odn,
+       struct berval *res
+)
+{
+       int     i, src, dst;
+       struct berval pretty = {0,NULL}, *dn = odn;
+
+       assert( res );
+
+       if ( dn == NULL ) {
+               res->bv_val = NULL;
+               res->bv_len = 0;
+               return 0;
+       }
+       if ( dc->rwmap == NULL || dc->rwmap->rwm_suffix_massage == NULL ) {
+               *res = *dn;
+               return 0;
+       }
+
+       if ( dc->tofrom ) {
+               src = 0 + dc->normalized;
+               dst = 2 + dc->normalized;
+       } else {
+               src = 2 + dc->normalized;
+               dst = 0 + dc->normalized;
+               /* DN from remote server may be in arbitrary form.
+                * Pretty it so we can parse reliably.
+                */
+               dnPretty( NULL, dn, &pretty, NULL );
+               if (pretty.bv_val) dn = &pretty;
+       }
+
+       for ( i = 0;
+               dc->rwmap->rwm_suffix_massage[i].bv_val != NULL;
+               i += 4 ) {
+               int aliasLength = dc->rwmap->rwm_suffix_massage[i+src].bv_len;
+               int diff = dn->bv_len - aliasLength;
+
+               if ( diff < 0 ) {
+                       /* alias is longer than dn */
+                       continue;
+               } else if ( diff > 0 && ( !DN_SEPARATOR(dn->bv_val[diff-1]))) {
+                       /* boundary is not at a DN separator */
+                       continue;
+                       /* At a DN Separator */
+               }
+
+               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->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",
+                               dn->bv_val, res->bv_val, 0 );
+#else
+                       Debug( LDAP_DEBUG_ARGS,
+                               "ldap_back_dn_massage:"
+                               " converted \"%s\" to \"%s\"\n",
+                               dn->bv_val, res->bv_val, 0 );
+#endif
+                       break;
+               }
+       }
+       if (pretty.bv_val) {
+               ch_free(pretty.bv_val);
+               dn = odn;
+       }
+       /* Nothing matched, just return the original DN */
+       if (res->bv_val == NULL) {
+               *res = *dn;
+       }
+
+       return 0;
+}
+#endif /* !ENABLE_REWRITE */