from jon@symas.com - minor cleanup

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index dda814b38532396673988d29c312f53c6b8205f9..30fa29afe4b8105b5c3dae7b28ab7363b4fef1f4 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1131,6 +1131,7 @@ aci_bvstrdup( struct berval *bv )
        return(s);
 }
 
+#ifdef SLAPD_ACI_ENABLED
 static int
 aci_strbvcmp(
        const char *s,
@@ -1148,6 +1149,7 @@ aci_strbvcmp(
                return(-1);
        return(0);
 }
+#endif
 
 static int
 aci_get_part(

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 077fb6f1464a59a886297cc931a383c9eff65689..d160ee570485ebd8aa5798d1edefdebaad5f85ea 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -773,7 +773,7 @@ extern int num_subs;        /* config.c */
 int
 glue_sub_init( )
 {
-       int i, j, k;
+       int i, j;
        int cont = num_subs;
        BackendDB *b1, *be;
        BackendInfo *bi;

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 4a19e01a5ebb6f79be800470e756ea2a37531562..dc614779a51328792a249f2899d9f3db1244a7d5 100644 (file)
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -81,7 +81,7 @@ get_limits(
                                         * if ndn is more that one rdn
                                         * below dn_pat, continue
                                         */
-                                       if ( dn_rdnlen( NULL, ndn ) != d - 1 ) {
+                                       if ( (size_t) dn_rdnlen( NULL, ndn ) != d - 1 ) {
                                                break;
                                        }
                                }

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 7b3c9a088ba17fdfb49c9fbefa89963d8792a3ec..ad8cc62bc8da22d9d7321d037edd96a4b43d45e4 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -218,7 +218,7 @@ LDAP_SLAPD_F (Attribute *) backend_operational(
  */
 
 LDAP_SLAPD_F (int) glue_back_initialize( BackendInfo *bi );
-
+LDAP_SLAPD_F (int) glue_sub_init( void );
 
 /*
  * ch_malloc.c

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 1d3ea4241506dfc00e8e50423f73ce266fe06b8f..5b04f2920d32ac118800e062c5ccbbd0f67a4054 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1240,7 +1240,7 @@ approxMatch(
        /* Work through the asserted value's words, to see if at least some
           of the words are there, in the same order. */
        len = 0;
-       while ( nextchunk < avlen ) {
+       while ( (size_t) nextchunk < avlen ) {
                len = strcspn( assertv + nextchunk, SLAPD_APPROX_DELIMITER);
                if( len == 0 ) {
                        nextchunk++;

diff --git a/servers/slapd/tools/slappasswd.c b/servers/slapd/tools/slappasswd.c
index 639b8a3f2dfe87643315bd283b8a0ab87c6ff304..0e16351908550abe1f876b1ba029fe3fbc38a55a 100644 (file)
--- a/servers/slapd/tools/slappasswd.c
+++ b/servers/slapd/tools/slappasswd.c
@@ -42,12 +42,10 @@ usage(const char *s)
 int
 main( int argc, char *argv[] )
 {
-       int rc;
        char    *scheme = "{SSHA}";
        char    *newpw = NULL;
 
        int             i;
-       int             version = -1;
        struct berval passwd;
        struct berval *hash = NULL;