misc cleanup

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 72f815481156442ac5b5dff5f181e844775c7025..143d75240b1939c76e3bf622754d6b134af193fa 100644 (file)
--- 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 2e465df9eed59d9362e2e42bec4368941ea771f1..8b43955b6f17e44aa931cb77620fafaf01553422 100644 (file)
--- 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 36eeb968f0528f73c1538e4d5dadd53bbf68178f..ec3712c31abbcedce439ce9f981317114bb4014b 100644 (file)
--- 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 5a717d6935937c28e24800f20c2c8a576cecbb67..b578a35be70b9314f21fb0c099ab118039540d47 100644 (file)
--- 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)