vrFilter fixes

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 40064a47fa3af42d25058f4d0d76ba65e3371d52..23aa4e78399eac50b14aee2a5505ef497439b452 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -439,7 +439,11 @@ dnPretty2(
        assert( val );
        assert( out );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ARGS, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
+#endif
 
        if ( val->bv_len == 0 ) {
                ber_dupbv( out, val );
@@ -496,7 +500,11 @@ dnPrettyNormal(
        struct berval *pretty,
        struct berval *normal)
 {
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, ENTRY, ">>> dnPrettyNormal: <%s>\n", val->bv_val, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, ">>> dnPrettyNormal: <%s>\n", val->bv_val, 0, 0 );
+#endif
 
        assert( val );
        assert( pretty );
@@ -562,8 +570,13 @@ dnPrettyNormal(
                }
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (OPERATION, RESULTS, "<<< dnPrettyNormal: <%s>, <%s>\n",
+               pretty->bv_val, normal->bv_val, 0  );
+#else
        Debug( LDAP_DEBUG_TRACE, "<<< dnPrettyNormal: <%s>, <%s>\n",
                pretty->bv_val, normal->bv_val, 0 );
+#endif
 
        return LDAP_SUCCESS;
 }
@@ -595,9 +608,8 @@ dnMatch(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-               "dnMatch: %d\n    %s\n    %s\n", match,
-               value->bv_val, asserted->bv_val ));
+       LDAP_LOG( CONFIG, ENTRY, "dnMatch: %d\n    %s\n    %s\n", 
+               match, value->bv_val, asserted->bv_val  );
 #else
        Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
                match, value->bv_val, asserted->bv_val );
@@ -624,7 +636,8 @@ dnParent(
 
        /* one-level dn */
        if ( p == NULL ) {
-               *pdn = slap_empty_bv;
+               pdn->bv_len = 0;
+               pdn->bv_val = dn->bv_val + dn->bv_len;
                return;
        }
 
@@ -786,7 +799,7 @@ build_new_dn( struct berval * new_dn,
        new_dn->bv_len = parent_dn->bv_len + newrdn->bv_len + 1;
        new_dn->bv_val = (char *) ch_malloc( new_dn->bv_len + 1 );
 
-       ptr = slap_strcopy( new_dn->bv_val, newrdn->bv_val );
+       ptr = lutil_strcopy( new_dn->bv_val, newrdn->bv_val );
        *ptr++ = ',';
        strcpy( ptr, parent_dn->bv_val );
 }
@@ -830,39 +843,24 @@ dnIsSuffix(
        return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
 }
 
+#ifdef HAVE_TLS
 /*
- * Convert a DN from X.500 format into a normalized DN
+ * Convert an X.509 DN into a normalized LDAP DN
  */
 int
-dnDCEnormalize( char *dce, struct berval *out )
+dnX509normalize( void *x509_name, struct berval *out )
 {
-       int rc;
-       LDAPDN *dn = NULL;
-
-       out->bv_val = NULL;
-       out->bv_len = 0;
-
-       rc = ldap_str2dn( dce, &dn, LDAP_DN_FORMAT_DCE );
-       if  ( rc != LDAP_SUCCESS )
-               return rc;
-
-       /*
-        * Schema-aware rewrite
-        */
-       if ( LDAPDN_rewrite( dn, 0 ) != LDAP_SUCCESS ) {
-               ldap_dnfree( dn );
-               return LDAP_INVALID_SYNTAX;
-       }
-
-       /*
-        * Back to string representation
-        */
-       rc = ldap_dn2bv( dn, out, LDAP_DN_FORMAT_LDAPV3 );
+       /* Invoke the LDAP library's converter with our schema-rewriter */
+       return ldap_X509dn2bv( x509_name, out, LDAPDN_rewrite, 0 );
+}
 
-       ldap_dnfree( dn );
+/*
+ * Get the TLS session's peer's DN into a normalized LDAP DN
+ */
+int
+dnX509peerNormalize( void *ssl, struct berval *dn )
+{
 
-       if ( rc != LDAP_SUCCESS ) {
-               rc = LDAP_INVALID_SYNTAX;
-       }
-       return rc;
+       return ldap_pvt_tls_get_peer_dn( ssl, dn, (LDAPDN_rewrite_dummy *)LDAPDN_rewrite, 0 );
 }
+#endif