Switch to openldap-data

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 5068a0461575fc51f1602fa5b1a4c41cb7c2fba8..a70d5df29252675680b95b880b1aae67cfd68e2a 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -564,20 +564,19 @@ dnMatch(
  * note: the incoming dn is assumed to be normalized/prettyfied,
  * so that escaped rdn/ava separators are in '\'+hexpair form
  */
-int
+void
 dnParent( 
        struct berval   *dn, 
        struct berval   *pdn )
 {
-       const char      *p;
+       char    *p;
 
        p = strchr( dn->bv_val, ',' );
 
        /* one-level dn */
        if ( p == NULL ) {
-               pdn->bv_val = "";
-               pdn->bv_len = 0;
-               return LDAP_SUCCESS;
+               *pdn = slap_empty_bv;
+               return;
        }
 
        assert( DN_SEPARATOR( p[ 0 ] ) );
@@ -587,93 +586,8 @@ dnParent(
        pdn->bv_val = p;
        pdn->bv_len = dn->bv_len - (p - dn->bv_val);
 
-       return LDAP_SUCCESS;
-}
-
-#ifdef SLAP_DN_MIGRATION
-/*
- * these routines are provided for migration purposes only!
- *     dn_normalize is deprecated in favor of dnNormalize
- *     strcmp/strcasecmp for DNs is deprecated in favor of dnMatch
- *
- * other routines are likewise deprecated but may not yet have
- * replacement functions.
- */
-
-/*
- * dn_normalize - put dn into a canonical form suitable for storing
- * in a hash database. this involves normalizing the case as well as
- * the format. the dn is normalized in place as well as returned if valid.
- * Deprecated in favor of dnNormalize()
- */
-char *
-dn_normalize( char *dn )
-{
-       struct berval val;
-       struct berval *normalized = NULL;
-       int             rc;
-
-       if ( dn == NULL || dn[0] == '\0' ) {
-               return dn;
-       }
-
-       val.bv_val = dn;
-       val.bv_len = strlen( dn );
-
-       rc = dnNormalize( NULL, &val, &normalized );
-       if ( rc != LDAP_SUCCESS ) {
-               return NULL;
-       }
-
-       if ( val.bv_len < normalized->bv_len ) {
-               ber_bvfree( normalized );
-               return NULL;
-       }
-
-       AC_MEMCPY( dn, normalized->bv_val, normalized->bv_len + 1 );
-       ber_bvfree( normalized );
-
-       return dn;
-}
-
-/*
- * dn_parent - return the dn's parent, in-place
- * FIXME: should be replaced by dnParent()
- */
-char *
-dn_parent(
-       Backend         *be,
-       const char      *dn )
-{
-       const char      *pdn;
-       struct berval   bv;
-
-       if ( dn == NULL ) {
-               return NULL;
-       }
-
-       while ( dn[ 0 ] != '\0' && ASCII_SPACE( dn[ 0 ] ) ) {
-               dn++;
-       }
-
-       if ( dn[ 0 ] == '\0' ) {
-               return NULL;
-       }
-
-       bv.bv_val = dn;
-       bv.bv_len = strlen(bv.bv_val);
-       if ( be != NULL && be_issuffix( be, &bv ) ) {
-               return NULL;
-       }
-
-       if ( dnParent( dn, &pdn ) != LDAP_SUCCESS ) {
-               return NULL;
-       }
-       
-       return ( char * )pdn;
+       return;
 }
-#endif /* SLAP_DN_MIGRATION */
-
 
 int
 dnExtractRdn( 
@@ -713,7 +627,6 @@ dn_rdnlen(
        Backend         *be,
        struct berval   *dn_in )
 {
-       int             rc;
        const char      *p;
 
        assert( dn_in );