From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 14 Jun 2004 20:04:36 +0000 (+0000)
Subject: fix build when #define BACKSQL_TRACE
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~274
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6c41f12ff177f7a9cb16828fd5699a5d1992ea88;p=openldap

fix build when #define BACKSQL_TRACE
---

diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c
index 739f62ef02..ee01b8ddd1 100644
--- a/servers/slapd/back-sql/schema-map.c
+++ b/servers/slapd/back-sql/schema-map.c
@@ -532,7 +532,7 @@ backsql_oc2oc( backsql_info *si, ObjectClass *oc )
 #ifdef BACKSQL_TRACE
 	Debug( LDAP_DEBUG_TRACE, "==>backsql_oc2oc(): "
 		"searching for objectclass with name=\"%s\"\n",
-		objclass, 0, 0 );
+		oc->soc_cname.bv_val, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
 	tmp.bom_oc = oc;
@@ -541,7 +541,7 @@ backsql_oc2oc( backsql_info *si, ObjectClass *oc )
 	if ( res != NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "<==backsql_oc2oc(): "
 			"found name=\"%s\", id=%d\n", 
-			BACKSQL_OC_NAME( res ), res->id, 0 );
+			BACKSQL_OC_NAME( res ), res->bom_id, 0 );
 	} else {
 		Debug( LDAP_DEBUG_TRACE, "<==backsql_oc2oc(): "
 			"not found\n", 0, 0, 0 );
@@ -559,7 +559,7 @@ backsql_name2oc( backsql_info *si, struct berval *oc_name )
 #ifdef BACKSQL_TRACE
 	Debug( LDAP_DEBUG_TRACE, "==>oc_with_name(): "
 		"searching for objectclass with name=\"%s\"\n",
-		objclass, 0, 0 );
+		oc_name->bv_val, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
 	tmp.bom_oc = oc_bvfind( oc_name );
@@ -618,7 +618,7 @@ backsql_ad2at( backsql_oc_map_rec* objclass, AttributeDescription *ad )
 #ifdef BACKSQL_TRACE
 	Debug( LDAP_DEBUG_TRACE, "==>backsql_ad2at(): "
 		"searching for attribute \"%s\" for objectclass \"%s\"\n",
-		attr, BACKSQL_OC_NAME( objclass ), 0 );
+		ad->ad_cname.bv_val, BACKSQL_OC_NAME( objclass ), 0 );
 #endif /* BACKSQL_TRACE */
 
 	tmp.bam_ad = ad;
diff --git a/servers/slapd/back-sql/util.c b/servers/slapd/back-sql/util.c
index 4523b31377..1bb975f434 100644
--- a/servers/slapd/back-sql/util.c
+++ b/servers/slapd/back-sql/util.c
@@ -73,7 +73,7 @@ backsql_strcat( struct berbuf *dest, ... )
 			|| dest->bb_val.bv_len == strlen( dest->bb_val.bv_val ) );
  
 #ifdef BACKSQL_TRACE
-	Debug( LDAP_DEBUG_TRACE, "==>backsql_strcat()\n" );
+	Debug( LDAP_DEBUG_TRACE, "==>backsql_strcat()\n", 0, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
 	va_start( strs, dest );
@@ -141,7 +141,7 @@ backsql_strfcat( struct berbuf *dest, const char *fmt, ... )
 			|| dest->bb_val.bv_len == strlen( dest->bb_val.bv_val ) );
  
 #ifdef BACKSQL_TRACE
-	Debug( LDAP_DEBUG_TRACE, "==>backsql_strfcat()\n" );
+	Debug( LDAP_DEBUG_TRACE, "==>backsql_strfcat()\n", 0, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
 	va_start( strs, fmt );