Free IDL_CACHE locks

[openldap] / servers / slapd / back-ldap / suffixmassage.c

diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index d24af0e275af0e3ca6b868cf1271e71d70894e0b..53193a2025577b8fbeae0f5d8d450302e0a6c236 100644 (file)
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -30,8 +30,6 @@
 
 #include "portable.h"
 
-#ifndef ENABLE_REWRITE
-
 #include <stdio.h>
 
 #include <ac/socket.h>
@@ -39,79 +37,136 @@
 #include "slap.h"
 #include "back-ldap.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).
  */
-void
+int
 ldap_back_dn_massage(
-       struct ldapinfo *li,
-       struct berval *dn,
-       struct berval *res,
-       int normalized,
-       int tofrom
+       dncookie *dc,
+       struct berval *odn,
+       struct berval *res
 )
 {
        int     i, src, dst;
+       struct berval pretty = {0,NULL}, *dn = odn;
 
        assert( res );
 
-        if ( dn == NULL ) {
+       if ( dn == NULL ) {
                res->bv_val = NULL;
                res->bv_len = 0;
-               return;
+               return 0;
        }
-        if ( li == NULL || li->suffix_massage == NULL ) {
+       if ( dc->rwmap == NULL || dc->rwmap->rwm_suffix_massage == NULL ) {
                *res = *dn;
-               return;
+               return 0;
        }
 
-       if ( tofrom ) {
-               src = 0 + normalized;
-               dst = 2 + normalized;
+       if ( dc->tofrom ) {
+               src = 0 + dc->normalized;
+               dst = 2 + dc->normalized;
        } else {
-               src = 2 + normalized;
-               dst = 0 + normalized;
+               src = 2 + dc->normalized;
+               dst = 0 + dc->normalized;
+               /* DN from remote server may be in arbitrary form.
+                * Pretty it so we can parse reliably.
+                */
+               dnPretty2( NULL, dn, &pretty, NULL );
+               if (pretty.bv_val) dn = &pretty;
        }
 
-        for ( i = 0;
-                li->suffix_massage[i].bv_val != NULL;
-                i += 4 ) {
-                int aliasLength = li->suffix_massage[i+src].bv_len;
-                int diff = dn->bv_len - aliasLength;
+       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 ) {
-                        if ( normalized && ( ! 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 ( 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( li->suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
-                       res->bv_len = diff + li->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], li->suffix_massage[i+dst].bv_val );
+               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 (( "suffixmassage", LDAP_LEVEL_ARGS,
-                                               "ldap_back_dn_massage: converted \"%s\" to \"%s\"\n",
-                                               dn->bv_val, res->bv_val ));
+                       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:"
+                       Debug( LDAP_DEBUG_ARGS,
+                               "ldap_back_dn_massage:"
                                " converted \"%s\" to \"%s\"\n",
-                                dn->bv_val, res->bv_val, 0 );
+                               dn->bv_val, res->bv_val, 0 );
 #endif
-                        break;
-                }
-        }
+                       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;
+       return 0;
 }
 #endif /* !ENABLE_REWRITE */