diff options
Diffstat (limited to 'ldap/servers/plugins')
-rw-r--r-- | ldap/servers/plugins/chainingdb/cb_config.c | 3 | ||||
-rw-r--r-- | ldap/servers/plugins/deref/deref.c | 2 | ||||
-rw-r--r-- | ldap/servers/plugins/dna/dna.c | 3 | ||||
-rw-r--r-- | ldap/servers/plugins/pwdstorage/smd5_pwd.c | 6 | ||||
-rw-r--r-- | ldap/servers/plugins/uiduniq/utils.c | 5 | ||||
-rw-r--r-- | ldap/servers/plugins/usn/usn.c | 2 |
6 files changed, 7 insertions, 14 deletions
diff --git a/ldap/servers/plugins/chainingdb/cb_config.c b/ldap/servers/plugins/chainingdb/cb_config.c index b399ed7b..bc12cd7d 100644 --- a/ldap/servers/plugins/chainingdb/cb_config.c +++ b/ldap/servers/plugins/chainingdb/cb_config.c @@ -632,8 +632,7 @@ static int cb_parse_config_entry(cb_backend * cb, Slapi_Entry *e) } else if ( !strcasecmp ( attr_name, CB_CONFIG_GLOBAL_DEBUG )) { i = slapi_attr_first_value(attr, &sval); - if (i != -1 ) { - (struct berval *) slapi_value_get_berval(sval); + if ((i != -1) && slapi_value_get_berval(sval)) { /* any value */ cb_set_debug(1); } diff --git a/ldap/servers/plugins/deref/deref.c b/ldap/servers/plugins/deref/deref.c index 5bbab138..e7fdaa5c 100644 --- a/ldap/servers/plugins/deref/deref.c +++ b/ldap/servers/plugins/deref/deref.c @@ -380,7 +380,7 @@ deref_parse_ctrl_value(DerefSpecList *speclist, const struct berval *ctrlbv, int PR_ASSERT(ctrlbv && ctrlbv->bv_val && ctrlbv->bv_len && ldapcode && ldaperrtext); - ber = ber_init(ctrlbv); + ber = ber_init((struct berval *)ctrlbv); for (tag = ber_first_element(ber, &len, &last); (tag != LBER_ERROR) && (tag != LBER_END_OF_SEQORSET); tag = ber_next_element(ber, &len, last)) { diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c index 5838cd74..558e6138 100644 --- a/ldap/servers/plugins/dna/dna.c +++ b/ldap/servers/plugins/dna/dna.c @@ -1004,7 +1004,6 @@ dna_parse_config_entry(Slapi_Entry * e, int apply) break; } - next: list = PR_NEXT_LINK(list); if (dna_global_config == list) { @@ -1772,7 +1771,7 @@ dna_first_free_value(struct configEntry *config_entry, char *filter = NULL; char *prefix; int multitype; - int result, status, filterlen; + int result, status; PRUint64 tmpval, sval, i; char *strval = NULL; diff --git a/ldap/servers/plugins/pwdstorage/smd5_pwd.c b/ldap/servers/plugins/pwdstorage/smd5_pwd.c index cef3ee37..48baa24b 100644 --- a/ldap/servers/plugins/pwdstorage/smd5_pwd.c +++ b/ldap/servers/plugins/pwdstorage/smd5_pwd.c @@ -66,8 +66,8 @@ smd5_pw_cmp( const char *userpwd, const char *dbpwd ) unsigned int outLen; unsigned char userhash[MD5_LENGTH]; int hash_len; - unsigned char quick_dbhash[MD5_LENGTH + MD5_DEFAULT_SALT_LENGTH + 1]; - unsigned char *dbhash = quick_dbhash; + char quick_dbhash[MD5_LENGTH + MD5_DEFAULT_SALT_LENGTH + 1]; + char *dbhash = quick_dbhash; struct berval salt; char *hashresult = NULL; @@ -83,7 +83,7 @@ smd5_pw_cmp( const char *userpwd, const char *dbpwd ) */ hash_len = pwdstorage_base64_decode_len(dbpwd, 0); if ( hash_len >= sizeof(quick_dbhash) ) { /* get more space: */ - dbhash = (unsigned char*) slapi_ch_calloc( hash_len + 1, sizeof(char) ); + dbhash = (char*) slapi_ch_calloc( hash_len + 1, sizeof(char) ); if ( dbhash == NULL ) goto loser; } else { memset( quick_dbhash, 0, sizeof(quick_dbhash) ); diff --git a/ldap/servers/plugins/uiduniq/utils.c b/ldap/servers/plugins/uiduniq/utils.c index e99573bf..49660897 100644 --- a/ldap/servers/plugins/uiduniq/utils.c +++ b/ldap/servers/plugins/uiduniq/utils.c @@ -62,11 +62,6 @@ static char *plugin_name = "utils"; -/* - * Lock for updating a counter (global for all counters) - */ -static Slapi_Mutex *counter_lock = NULL; - /* ------------------------------------------------------------ */ /* * op_error - Record (and report) an operational error. diff --git a/ldap/servers/plugins/usn/usn.c b/ldap/servers/plugins/usn/usn.c index 75c80ba2..5dd5122b 100644 --- a/ldap/servers/plugins/usn/usn.c +++ b/ldap/servers/plugins/usn/usn.c @@ -290,7 +290,7 @@ usn_preop_delete(Slapi_PBlock *pb) if (CSN_SUCCESS != rc) { slapi_log_error(SLAPI_LOG_FATAL, USN_PLUGIN_SUBSYSTEM, "usn_preop_delete: csngen_new failed (%d)\n", rc); - csngen_free(&csn); + csn_free(&csn); goto bail; } operation_set_csn(op, csn); |