Fix pkiUser

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 3c68a0b98ab55b6ad7ef3ae815a397b2ec59e8a6..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,6 +831,7 @@ dnIsSuffix(
        return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
 }
 
+#ifdef HAVE_TLS
 /*
  * Convert an X.509 DN into a normalized LDAP DN
  */
@@ -843,8 +845,10 @@ dnX509normalize( void *x509_name, struct berval *out )
 /*
  * Get the TLS session's peer's DN into a normalized LDAP DN
  */
-char *
-dnX509peerNormalize( void *ssl )
+int
+dnX509peerNormalize( void *ssl, struct berval *dn )
 {
-       return ldap_pvt_tls_get_peer_dn( ssl, (LDAPDN_rewrite_dummy *)LDAPDN_rewrite, 0 );
+
+       return ldap_pvt_tls_get_peer_dn( ssl, dn, (LDAPDN_rewrite_dummy *)LDAPDN_rewrite, 0 );
 }
+#endif