cleanup

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 5ac362d1edecc6c2c9dccfd2b1bf058dc25df570..c8d08680419631d1742c39d86047c2bb6eced7b9 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -99,6 +99,8 @@ LDAPRDN_validate( LDAPRDN rdn )
                        }
                }
        }
+
+       return LDAP_SUCCESS;
 }
 
 /*
@@ -207,7 +209,6 @@ rdnValidate(
        struct berval *in )
 {
        int             rc;
-       LDAPDN          dn = NULL;
        LDAPRDN         rdn;
        char*           p;
 
@@ -1018,14 +1019,15 @@ rdnMatch(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG( CONFIG, ENTRY, "dnMatch: %d\n    %s\n    %s\n", 
+       LDAP_LOG( CONFIG, ENTRY, "rdnMatch: %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",
+       Debug( LDAP_DEBUG_ARGS, "rdnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
                match, value->bv_val, asserted->bv_val );
 #endif
 
        *matchp = match;
+
        return( LDAP_SUCCESS );
 }
 

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 588eb4c042c688166d9df0632935925c2a871bec..696ee9a83af8fc020a0b2cf717b789661e922ed5 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -818,7 +818,7 @@ slapi_modrdn_internal(
                goto cleanup;
        }
 
-       if ( rdnValidate( &op->oq_modrdn.rs_nnewrdn ) != LDAP_SUCCESS ) {
+       if ( rdn_validate( &op->oq_modrdn.rs_nnewrdn ) != LDAP_SUCCESS ) {
                goto cleanup;
        }