Commit 3bd8946c authored by Howard Chu's avatar Howard Chu
Browse files

from jon@symas.com - minor cleanup

parent 923cdcf3
...@@ -1131,6 +1131,7 @@ aci_bvstrdup( struct berval *bv ) ...@@ -1131,6 +1131,7 @@ aci_bvstrdup( struct berval *bv )
return(s); return(s);
} }
#ifdef SLAPD_ACI_ENABLED
static int static int
aci_strbvcmp( aci_strbvcmp(
const char *s, const char *s,
...@@ -1148,6 +1149,7 @@ aci_strbvcmp( ...@@ -1148,6 +1149,7 @@ aci_strbvcmp(
return(-1); return(-1);
return(0); return(0);
} }
#endif
static int static int
aci_get_part( aci_get_part(
......
...@@ -773,7 +773,7 @@ extern int num_subs; /* config.c */ ...@@ -773,7 +773,7 @@ extern int num_subs; /* config.c */
int int
glue_sub_init( ) glue_sub_init( )
{ {
int i, j, k; int i, j;
int cont = num_subs; int cont = num_subs;
BackendDB *b1, *be; BackendDB *b1, *be;
BackendInfo *bi; BackendInfo *bi;
......
...@@ -81,7 +81,7 @@ get_limits( ...@@ -81,7 +81,7 @@ get_limits(
* if ndn is more that one rdn * if ndn is more that one rdn
* below dn_pat, continue * below dn_pat, continue
*/ */
if ( dn_rdnlen( NULL, ndn ) != d - 1 ) { if ( (size_t) dn_rdnlen( NULL, ndn ) != d - 1 ) {
break; break;
} }
} }
......
...@@ -218,7 +218,7 @@ LDAP_SLAPD_F (Attribute *) backend_operational( ...@@ -218,7 +218,7 @@ LDAP_SLAPD_F (Attribute *) backend_operational(
*/ */
LDAP_SLAPD_F (int) glue_back_initialize( BackendInfo *bi ); LDAP_SLAPD_F (int) glue_back_initialize( BackendInfo *bi );
LDAP_SLAPD_F (int) glue_sub_init( void );
/* /*
* ch_malloc.c * ch_malloc.c
......
...@@ -1240,7 +1240,7 @@ approxMatch( ...@@ -1240,7 +1240,7 @@ approxMatch(
/* Work through the asserted value's words, to see if at least some /* Work through the asserted value's words, to see if at least some
of the words are there, in the same order. */ of the words are there, in the same order. */
len = 0; len = 0;
while ( nextchunk < avlen ) { while ( (size_t) nextchunk < avlen ) {
len = strcspn( assertv + nextchunk, SLAPD_APPROX_DELIMITER); len = strcspn( assertv + nextchunk, SLAPD_APPROX_DELIMITER);
if( len == 0 ) { if( len == 0 ) {
nextchunk++; nextchunk++;
......
...@@ -42,12 +42,10 @@ usage(const char *s) ...@@ -42,12 +42,10 @@ usage(const char *s)
int int
main( int argc, char *argv[] ) main( int argc, char *argv[] )
{ {
int rc;
char *scheme = "{SSHA}"; char *scheme = "{SSHA}";
char *newpw = NULL; char *newpw = NULL;
int i; int i;
int version = -1;
struct berval passwd; struct berval passwd;
struct berval *hash = NULL; struct berval *hash = NULL;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment