From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 9 Dec 2001 18:57:46 +0000 (+0000)
Subject: misc cleanup
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~682
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=30831a4012ee11c37809c39c1e2d6d09ae5d2341;p=openldap

misc cleanup
---

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 72f8154811..143d75240b 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -262,7 +262,7 @@ bdb_search(
 
 	/* if not root and candidates exceed to-be-checked entries, abort */
 	if ( !isroot && limit->lms_s_unchecked != -1 ) {
-		if ( BDB_IDL_N(candidates) > limit->lms_s_unchecked ) {
+		if ( BDB_IDL_N(candidates) > (unsigned) limit->lms_s_unchecked ) {
 			send_search_result( conn, op, 
 					LDAP_UNWILLING_TO_PERFORM,
 					NULL, NULL, NULL, NULL, 0 );
diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 2e465df9ee..8b43955b6f 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -58,7 +58,7 @@ glue_back_select (
 	int i;
 
 	bv.bv_len = strlen(dn);
-	bv.bv_val = dn;
+	bv.bv_val = (char *) dn;
 
 	for (i = 0; be->be_nsuffix[i]; i++) {
 		if (dn_issuffixbv (&bv, be->be_nsuffix[i]))
@@ -321,7 +321,7 @@ glue_back_search (
 		op->o_sresult = glue_back_sresult;
 		op->o_response = glue_back_response;
 		bv.bv_len = strlen(ndn);
-		bv.bv_val = ndn;
+		bv.bv_val = (char *) ndn;
 
 		/*
 		 * Execute in reverse order, most general first 
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 36eeb968f0..ec3712c31a 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -15,8 +15,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include <ldap_log.h>
-
 #include "slap.h"
 
 #include "../../libraries/liblber/lber-int.h"
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 5a717d6935..b578a35be7 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -21,7 +21,6 @@
 #include "ldap_utf8.h"
 
 #include "lutil_hash.h"
-/* We should replace MD5 with a faster hash */
 #define HASH_BYTES				LUTIL_HASH_BYTES
 #define HASH_CONTEXT			lutil_HASH_CTX
 #define HASH_Init(c)			lutil_HASHInit(c)