From e7792353919a1d36f0f8efac25cf537f029d9ebb Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 30 Jun 2004 01:17:05 +0000 Subject: [PATCH] cleanup --- servers/slapd/dn.c | 8 +++++--- servers/slapd/slapi/slapi_ops.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c index 5ac362d1ed..c8d0868041 100644 --- 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 588eb4c042..696ee9a83a 100644 --- 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; } -- 2.39.5