From: Luke Howard <lukeh@openldap.org>
Date: Fri, 11 Apr 2003 04:22:37 +0000 (+0000)
Subject: Fix compilation errors (caching must still be undefined though)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~399
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7cb946924e201590039530a0a76b80416fc59e5d;p=openldap

Fix compilation errors (caching must still be undefined though)
---

diff --git a/servers/slapd/back-meta/cache-query.c b/servers/slapd/back-meta/cache-query.c
index 65925d229f..98a67882a7 100644
--- a/servers/slapd/back-meta/cache-query.c
+++ b/servers/slapd/back-meta/cache-query.c
@@ -271,8 +271,8 @@ int base_scope_compare(
 	if (scope_stored < scope_incoming)
 		return 0;
 
-	dnNormalize2(NULL, dn_incoming, &ndn_incoming);  
-	dnNormalize2(NULL, dn_stored, &ndn_stored);  
+	dnNormalize2(NULL, dn_incoming, &ndn_incoming);
+	dnNormalize2(NULL, dn_stored, &ndn_stored);
 	
 	i = dnIsSuffix(&ndn_incoming, &ndn_stored);
 	
diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 73654fb40a..9775c0cbb2 100644
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -184,7 +184,7 @@ meta_back_db_config(
 		dn.bv_len = strlen( ludp->lud_dn );
 
 		rc = dnPrettyNormal( NULL, &dn, &li->targets[ i ]->psuffix,
-			&li->targets[ i ]->suffix );
+			&li->targets[ i ]->suffix, NULL );
 		if( rc != LDAP_SUCCESS ) {
 			fprintf( stderr, "%s: line %d: "
 					"target '%s' DN is invalid\n",
@@ -333,7 +333,7 @@ meta_back_db_config(
 
 		dn.bv_val = argv[ 1 ];
 		dn.bv_len = strlen( argv[ 1 ] );
-		if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->binddn ) != LDAP_SUCCESS ) {
+		if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->binddn, NULL ) != LDAP_SUCCESS ) {
 			fprintf( stderr, "%s: line %d: "
 					"bind DN '%s' is invalid\n",
 					fname, lineno, argv[ 1 ] );
@@ -390,7 +390,7 @@ meta_back_db_config(
 
 		dn.bv_val = argv[ 1 ];
 		dn.bv_len = strlen( argv[ 1 ] );
-		if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->pseudorootdn ) != LDAP_SUCCESS ) {
+		if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->pseudorootdn, NULL ) != LDAP_SUCCESS ) {
 			fprintf( stderr, "%s: line %d: "
 					"pseudoroot DN '%s' is invalid\n",
 					fname, lineno, argv[ 1 ] );
@@ -449,7 +449,7 @@ meta_back_db_config(
 
 		dn.bv_val = argv[ 1 ];
 		dn.bv_len = strlen( argv[ 1 ] );
-		if ( dnPrettyNormal( NULL, &dn, &pvnc, &nvnc ) != LDAP_SUCCESS ) {
+		if ( dnPrettyNormal( NULL, &dn, &pvnc, &nvnc, NULL ) != LDAP_SUCCESS ) {
 			fprintf( stderr, "%s: line %d: "
 					"suffix '%s' is invalid\n",
 					fname, lineno, argv[ 1 ] );
@@ -469,7 +469,7 @@ meta_back_db_config(
 
 		dn.bv_val = argv[ 2 ];
 		dn.bv_len = strlen( argv[ 2 ] );
-		if ( dnPrettyNormal( NULL, &dn, &prnc, &nrnc ) != LDAP_SUCCESS ) {
+		if ( dnPrettyNormal( NULL, &dn, &prnc, &nrnc, NULL ) != LDAP_SUCCESS ) {
 			fprintf( stderr, "%s: line %d: "
 					"massaged suffix '%s' is invalid\n",
 					fname, lineno, argv[ 2 ] );
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 65d90d3d87..7fac3f2d29 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -663,7 +663,7 @@ meta_send_entry(
 	 * 
 	 * FIXME: should we log anything, or delegate to dnNormalize2?
 	 */
-	if ( dnNormalize2( NULL, &ent.e_name, &ent.e_nname ) != LDAP_SUCCESS ) {
+	if ( dnNormalize2( NULL, &ent.e_name, &ent.e_nname, &op->o_tmpmemctx ) != LDAP_SUCCESS ) {
 		return LDAP_INVALID_DN_SYNTAX;
 	}