summaryrefslogtreecommitdiffstats
path: root/ldap
diff options
context:
space:
mode:
Diffstat (limited to 'ldap')
-rw-r--r--ldap/servers/plugins/chainingdb/cb_config.c3
-rw-r--r--ldap/servers/plugins/deref/deref.c2
-rw-r--r--ldap/servers/plugins/dna/dna.c3
-rw-r--r--ldap/servers/plugins/pwdstorage/smd5_pwd.c6
-rw-r--r--ldap/servers/plugins/uiduniq/utils.c5
-rw-r--r--ldap/servers/plugins/usn/usn.c2
-rw-r--r--ldap/servers/slapd/back-ldbm/import-threads.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c2
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_usn.c3
-rw-r--r--ldap/servers/slapd/back-ldbm/perfctrs.c1
-rw-r--r--ldap/servers/slapd/ldaputil.c2
-rw-r--r--ldap/servers/slapd/proto-slap.h2
-rw-r--r--ldap/servers/slapd/psearch.c2
-rw-r--r--ldap/servers/slapd/tools/dbscan.c22
-rw-r--r--ldap/servers/slapd/valueset.c2
-rw-r--r--ldap/servers/slapd/vattr.c1
16 files changed, 26 insertions, 36 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);
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 60a92b38..12018dbf 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -1321,7 +1321,7 @@ upgradedn_producer(void *param)
/* call post-entry plugin */
plugin_call_entryfetch_plugins((char **)&data.dptr, &data.dsize);
- slapi_ch_free_string((void**)&ecopy);
+ slapi_ch_free_string(&ecopy);
ecopy = (char *)slapi_ch_malloc(data.dsize + 1);
memcpy(ecopy, data.dptr, data.dsize);
*(ecopy + data.dsize) = '\0';
@@ -1732,7 +1732,7 @@ error:
info->state = ABORTED;
done:
- slapi_ch_free_string((void**)&ecopy);
+ slapi_ch_free_string(&ecopy);
slapi_ch_free(&(data.data));
}
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
index 83130207..deb818d6 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
@@ -1014,7 +1014,7 @@ attrcrypt_decrypt_index_key(backend *be,
rc = -1;
goto bail;
}
- (*out) = ber_bvdup(out_bv);
+ (*out) = ber_bvdup((struct berval *)out_bv);
if (NULL == *out) {
rc = -1;
}
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_usn.c b/ldap/servers/slapd/back-ldbm/ldbm_usn.c
index 2bb64bc2..2261e42d 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_usn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_usn.c
@@ -81,7 +81,7 @@ ldbm_usn_init(struct ldbminfo *li)
sdn = slapi_get_next_suffix_ext( &node, 0 )) {
be = slapi_mapping_tree_find_backend_for_sdn(sdn);
slapi_log_error(SLAPI_LOG_BACKLDBM, "ldbm_usn_init",
- "backend: %s \n", be->be_name, isglobal?"(global mode)":"");
+ "backend: %s%s\n", be->be_name, isglobal?" (global mode)":"");
rc = usn_get_last_usn(be, &last_usn);
if (0 == rc) { /* only when the last usn is available */
if (isglobal) {
@@ -201,7 +201,6 @@ int
ldbm_set_last_usn(Slapi_Backend *be)
{
PRUint64 last_usn = 0;
- PRUint64 current_usn = 0;
int isglobal = config_get_entryusn_global();
int rc = -1;
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.c b/ldap/servers/slapd/back-ldbm/perfctrs.c
index 521ba1f2..bb5ba00f 100644
--- a/ldap/servers/slapd/back-ldbm/perfctrs.c
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.c
@@ -211,7 +211,6 @@ void perfctrs_init(struct ldbminfo *li, perfctrs_private **ret_priv)
*ret_priv = priv;
return;
-error:
#if !defined(_WIN32)
if (priv) slapi_ch_free((void**)&priv->memory);
#endif
diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
index 8cf98896..77b08cdd 100644
--- a/ldap/servers/slapd/ldaputil.c
+++ b/ldap/servers/slapd/ldaputil.c
@@ -2020,7 +2020,7 @@ mozldap_ldap_explode( const char *dn, const int notypes, const int nametype )
return( NULL );
} else if ( count >= 8 ) {
if (( rdns = (char **)slapi_ch_realloc(
- rdns, (count+1) *
+ (char *)rdns, (count+1) *
sizeof( char *))) == NULL )
return( NULL );
}
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index ed146c44..6524c800 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -1368,7 +1368,7 @@ void *pagedresults_get_search_result(Connection *conn);
int pagedresults_set_search_result(Connection *conn, void *sr);
int pagedresults_get_search_result_count(Connection *conn);
int pagedresults_set_search_result_count(Connection *conn, int cnt);
-int pagedresults_get_search_result_get_size_estimate(Connection *conn);
+int pagedresults_get_search_result_set_size_estimate(Connection *conn);
int pagedresults_set_search_result_set_size_estimate(Connection *conn, int cnt);
int pagedresults_get_with_sort(Connection *conn);
int pagedresults_set_with_sort(Connection *conn, int flags);
diff --git a/ldap/servers/slapd/psearch.c b/ldap/servers/slapd/psearch.c
index afb3f187..c19d34f4 100644
--- a/ldap/servers/slapd/psearch.c
+++ b/ldap/servers/slapd/psearch.c
@@ -462,7 +462,7 @@ psearch_alloc()
if (( ps->ps_lock = PR_NewLock()) == NULL ) {
LDAPDebug( LDAP_DEBUG_ANY, "psearch_add: cannot create new lock. "
"Persistent search abandoned.\n", 0, 0, 0 );
- slapi_ch_free(&ps);
+ slapi_ch_free((void **)&ps);
return( NULL );
}
ps->ps_tid = (PRThread *) NULL;
diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index dfe811e1..0c36ddce 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -814,7 +814,7 @@ display_entryrdn_self(DB *db, ID id, const char *nrdn, int indent)
rc = cursor->c_get(cursor, &key, &data, DB_SET);
if (rc) {
fprintf(stderr, "Failed to position cursor at the key: %s: %s "
- "(%d)\n", key.data, db_strerror(rc), rc);
+ "(%d)\n", (char *)key.data, db_strerror(rc), rc);
goto bail;
}
@@ -859,7 +859,7 @@ display_entryrdn_parent(DB *db, ID id, const char *nrdn, int indent)
rc = cursor->c_get(cursor, &key, &data, DB_SET);
if (rc) {
fprintf(stderr, "Failed to position cursor at the key: %s: %s "
- "(%d)\n", key.data, db_strerror(rc), rc);
+ "(%d)\n", (char *)key.data, db_strerror(rc), rc);
goto bail;
}
@@ -908,10 +908,10 @@ display_entryrdn_children(DB *db, ID id, const char *nrdn, int indent)
fprintf(stderr, "Entryrdn index is corrupt; "
"data item for key %s is too large for our "
"buffer (need=%d actual=%d)\n",
- key.data, data.size, data.ulen);
+ (char *)key.data, data.size, data.ulen);
} else if (rc != DB_NOTFOUND) {
fprintf(stderr, "Failed to position cursor at the key: %s: %s "
- "(%d)\n", key.data, db_strerror(rc), rc);
+ "(%d)\n", (char *)key.data, db_strerror(rc), rc);
}
goto bail;
}
@@ -932,10 +932,10 @@ display_entryrdn_children(DB *db, ID id, const char *nrdn, int indent)
fprintf(stderr, "Entryrdn index is corrupt; "
"data item for key %s is too large for our "
"buffer (need=%d actual=%d)\n",
- key.data, data.size, data.ulen);
+ (char *)key.data, data.size, data.ulen);
} else if (rc != DB_NOTFOUND) {
fprintf(stderr, "Failed to position cursor at the key: %s: %s "
- "(%d)\n", key.data, db_strerror(rc), rc);
+ "(%d)\n", (char *)key.data, db_strerror(rc), rc);
}
}
bail:
@@ -961,7 +961,7 @@ display_entryrdn_item(DB *db, DBC *cursor, DBT *key)
rc = cursor->c_get(cursor, key, &data, DB_SET);
if (rc) {
fprintf(stderr, "Failed to position cursor at the key: %s: %s "
- "(%d)\n", key->data, db_strerror(rc), rc);
+ "(%d)\n", (char *)key->data, db_strerror(rc), rc);
return;
}
@@ -986,12 +986,12 @@ next:
fprintf(stderr, "Entryrdn index is corrupt; "
"data item for key %s is too large for our "
"buffer (need=%d actual=%d)\n",
- key->data, data.size, data.ulen);
+ (char *)key->data, data.size, data.ulen);
} else {
if (rc != DB_NOTFOUND) {
fprintf(stderr, "Failed to position cursor "
"at the key: %s: %s (%d)\n",
- key->data, db_strerror(rc), rc);
+ (char *)key->data, db_strerror(rc), rc);
}
}
goto bail;
@@ -1021,11 +1021,11 @@ next:
fprintf(stderr, "Entryrdn index is corrupt; "
"data item for key %s is too large for our "
"buffer (need=%d actual=%d)\n",
- key->data, data.size, data.ulen);
+ (char *)key->data, data.size, data.ulen);
goto bail;
} else if (rc != DB_NOTFOUND) {
fprintf(stderr, "Failed to position cursor at the key: %s: %s "
- "(%d)\n", key->data, db_strerror(rc), rc);
+ "(%d)\n", (char *)key->data, db_strerror(rc), rc);
goto bail;
}
flags = DB_NEXT|DB_MULTIPLE;
diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c
index 22ffb4aa..a2ae334f 100644
--- a/ldap/servers/slapd/valueset.c
+++ b/ldap/servers/slapd/valueset.c
@@ -303,7 +303,7 @@ valuearray_get_bervalarray(Slapi_Value **cvals,struct berval ***bvals)
*bvals = (struct berval **)slapi_ch_malloc((n + 1) * sizeof(struct berval *));
for(i=0;i<n;i++)
{
- (*bvals)[i] = ber_bvdup(slapi_value_get_berval(cvals[i]));
+ (*bvals)[i] = ber_bvdup((struct berval *)slapi_value_get_berval(cvals[i]));
}
(*bvals)[i] = NULL;
}
diff --git a/ldap/servers/slapd/vattr.c b/ldap/servers/slapd/vattr.c
index 025c71e0..df895493 100644
--- a/ldap/servers/slapd/vattr.c
+++ b/ldap/servers/slapd/vattr.c
@@ -1650,7 +1650,6 @@ int slapi_vattrspi_regattr(vattr_sp_handle *h,char *type_name_to_register, char*
ret = vattr_map_sp_insert(type_to_add,h,hint);
-done:
slapi_sdn_done(&original_dn);
if(free_type_to_add)
{
generated by cgit (git 2.34.1) at 2024-06-09 07:59:55 +0000