from jon@symas.com - minor cleanup

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(

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;

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;
 					}
 				}

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

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++;

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;