Commit 5cd994ed authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

remove dnNormalize2

replace calls to dnNormalize2 with calls to dnNormalize
parent eebc51b9
......@@ -94,7 +94,7 @@ static int slap_parseURI( Operation *op, struct berval *uri,
is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
rc = dnNormalize2( NULL, &bv, searchbase, op->o_tmpmemctx );
rc = dnNormalize( 0, NULL, NULL, &bv, searchbase, op->o_tmpmemctx );
if( rc == LDAP_SUCCESS ) {
*scope = LDAP_SCOPE_BASE;
}
......@@ -134,7 +134,7 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
/* Grab the searchbase */
bv.bv_val = ludp->lud_dn;
bv.bv_len = strlen( bv.bv_val );
rc = dnNormalize2( NULL, &bv, searchbase, op->o_tmpmemctx );
rc = dnNormalize( 0, NULL, NULL, &bv, searchbase, op->o_tmpmemctx );
done:
if( rc != LDAP_SUCCESS ) {
......
......@@ -773,7 +773,7 @@ uniqueMemberNormalize(
*(uid.bv_val++) = '\0';
}
rc = dnNormalize2( NULL, &out, normalized, ctx );
rc = dnNormalize( 0, NULL, NULL, &out, normalized, ctx );
if( rc != LDAP_SUCCESS ) {
free( out.bv_val );
......@@ -1997,7 +1997,7 @@ serial_and_issuer_parse(
bv.bv_len = end-begin+1;
bv.bv_val = begin;
dnNormalize2( NULL, &bv, issuer_dn );
return dnNormalize( 0, NULL, NULL, &bv, issuer_dn );
}
return LDAP_SUCCESS;
......
......@@ -493,7 +493,8 @@ static int doSearchRewriteFNs( Operation *op )
if( op->o_req_ndn.bv_val != NULL) {
sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
}
rc = dnNormalize2( NULL, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
rc = dnNormalize( 0, NULL, NULL, &op->o_req_dn, &op->o_req_ndn,
op->o_tmpmemctx );
if ( rc != LDAP_SUCCESS ) {
return rc;
}
......
......@@ -879,7 +879,7 @@ slapi_dn_normalize_case( char *dn )
bdn.bv_val = dn;
bdn.bv_len = strlen( dn );
if ( dnNormalize2( NULL, &bdn, &ndn, NULL ) != LDAP_SUCCESS ) {
if ( dnNormalize( 0, NULL, NULL, &bdn, &ndn, NULL ) != LDAP_SUCCESS ) {
return NULL;
}
......@@ -908,11 +908,13 @@ slapi_dn_issuffix(
bsuffix.bv_val = suffix;
bsuffix.bv_len = strlen( suffix );
if ( dnNormalize2( NULL, &bdn, &ndn, NULL ) != LDAP_SUCCESS ) {
if ( dnNormalize( 0, NULL, NULL, &bdn, &ndn, NULL ) != LDAP_SUCCESS ) {
return 0;
}
if ( dnNormalize2( NULL, &bsuffix, &nsuffix, NULL ) != LDAP_SUCCESS ) {
if ( dnNormalize( 0, NULL, NULL, &bsuffix, &nsuffix, NULL )
!= LDAP_SUCCESS )
{
slapi_ch_free( (void **)&ndn.bv_val );
return 0;
}
......
......@@ -232,7 +232,7 @@ slap_tool_init(
if( base.bv_val != NULL ) {
struct berval nbase;
rc = dnNormalize2( NULL, &base, &nbase, NULL );
rc = dnNormalize( 0, NULL, NULL, &base, &nbase, NULL );
if( rc != LDAP_SUCCESS ) {
fprintf( stderr, "%s: slap_init invalid suffix (\"%s\")\n",
progname, base.bv_val );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment