From: Howard Chu <hyc@openldap.org>
Date: Sat, 19 Jan 2002 04:50:26 +0000 (+0000)
Subject: Cleanup lint
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~63
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eab49fe5da8db255c44717d1bb4f3913aba42438;p=openldap

Cleanup lint
---

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 777cf9d6de..8d6b121006 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -456,10 +456,10 @@ int slap_sasl_match( char *rule, struct berval *assertDN, char *authc )
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl_match: comparing DN %s to rule %s\n", assertDN, rule ));
+		"slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule ));
 #else
 	Debug( LDAP_DEBUG_TRACE,
-	   "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN, rule, 0 );
+	   "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule, 0 );
 #endif
 
 	rc = slap_parseURI( rule, &searchbase, &scope, &filter );
@@ -557,11 +557,11 @@ slap_sasl_check_authz(char *searchDN, char *assertDN, struct berval *attr, char
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
 		   "slap_sasl_check_authz: does %s match %s rule in %s?\n",
-		   assertDN, attr, searchDN ));
+		   assertDN, attr->bv_val, searchDN ));
 #else
 	Debug( LDAP_DEBUG_TRACE,
 	   "==>slap_sasl_check_authz: does %s match %s rule in %s?\n",
-	   assertDN, attr, searchDN);
+	   assertDN, attr->bv_val, searchDN);
 #endif
 
 	rc = slap_bv2ad( attr, &ad, &errmsg );
@@ -589,10 +589,10 @@ COMPLETE:
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		   "slap_sasl_check_authz: %s check returning %s\n", attr, rc ));
+		   "slap_sasl_check_authz: %s check returning %s\n", attr->bv_val, rc ));
 #else
 	Debug( LDAP_DEBUG_TRACE,
-	   "<==slap_sasl_check_authz: %s check returning %d\n", attr, rc, 0);
+	   "<==slap_sasl_check_authz: %s check returning %d\n", attr->bv_val, rc, 0);
 #endif
 
 	return( rc );
diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 5f82e94c88..1ae61e0b65 100644
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -184,7 +184,6 @@ parse_at(
 	LDAPAttributeType *at;
 	int		code;
 	const char	*err;
-	char		*oid = NULL;
 
 	at = ldap_str2attributetype( line, &code, &err, LDAP_SCHEMA_ALLOW_ALL );
 	if ( !at ) {