Fix pkiUser

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 40064a47fa3af42d25058f4d0d76ba65e3371d52..75a349b4333dfecf05e838aad623154e6e47c670 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -624,7 +624,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;
        }
 
@@ -830,39 +831,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