rework op/rs structures to deal with opeartional attributes

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 5ac362d1edecc6c2c9dccfd2b1bf058dc25df570..44528fa2f63271998e13026268bcd5bc3dc4fb24 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;
 
@@ -974,6 +975,8 @@ dnMatch(
        assert( matchp );
        assert( value );
        assert( assertedValue );
+       assert( !BER_BVISNULL( value ) );
+       assert( !BER_BVISNULL( asserted ) );
        
        match = value->bv_len - asserted->bv_len;
 
@@ -1018,14 +1021,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 );
 }