6:08 p.m.
include/base/dbtbase.h | 2
include/libaccess/aclproto.h | 1
include/libaccess/dbtlibaccess.h | 2
ldap/servers/plugins/chainingdb/cb_config.c | 3
ldap/servers/plugins/deref/deref.c | 2
ldap/servers/plugins/dna/dna.c | 3
ldap/servers/plugins/pwdstorage/smd5_pwd.c | 6
ldap/servers/plugins/uiduniq/utils.c | 5
ldap/servers/plugins/usn/usn.c | 2
ldap/servers/slapd/back-ldbm/import-threads.c | 4
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 2
ldap/servers/slapd/back-ldbm/ldbm_usn.c | 3
ldap/servers/slapd/back-ldbm/perfctrs.c | 1
ldap/servers/slapd/ldaputil.c | 2
ldap/servers/slapd/proto-slap.h | 2
ldap/servers/slapd/psearch.c | 2
ldap/servers/slapd/tools/dbscan.c | 22 +-
ldap/servers/slapd/valueset.c | 2
ldap/servers/slapd/vattr.c | 1
lib/base/crit.cpp | 6
lib/base/ereport.cpp | 2
lib/base/util.cpp | 3
lib/ldaputil/certmap.c | 212 --------------------------
lib/libaccess/aclcache.cpp | 1
lib/libaccess/aclflush.cpp | 1
lib/libaccess/aclpriv.h | 1
lib/libaccess/authdb.cpp | 112 -------------
lib/libaccess/oneeval.cpp | 1
lib/libaccess/permhash.h | 11 -
lib/libaccess/register.cpp | 1
30 files changed, 36 insertions(+), 382 deletions(-)
New commits:
commit ea408efe551ad837b08423f6d32b5433ab8dfe2b
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Aug 31 21:17:30 2010 -0600
fix compiler warnings - unused vars/funcs, invalid casts
This commit fixes many compiler warnings, mostly for things like unused
variables, functions, goto labels.
One place was using csngen_free instead of csn_free. A couple of places
were using casts incorrectly, and several places needed some casts added.
Tested on: RHEL5 x86_64, Fedora 14 x86_64
Reviewed by: nkinder (Thanks!)
diff --git a/include/base/dbtbase.h b/include/base/dbtbase.h
index 380bfa0..801cc07 100644
--- a/include/base/dbtbase.h
+++ b/include/base/dbtbase.h
@@ -43,7 +43,9 @@
#define LIBRARY_NAME "base"
+#ifdef RESOURCE_STR
static char dbtbaseid[] = "$DBT: base referenced v1 $";
+#endif
#include "i18n.h"
diff --git a/include/libaccess/aclproto.h b/include/libaccess/aclproto.h
index 7562c71..5f27384 100644
--- a/include/libaccess/aclproto.h
+++ b/include/libaccess/aclproto.h
@@ -144,7 +144,6 @@ NSAPI_PUBLIC int ACL_Init(void);
NSAPI_PUBLIC int ACL_InitPostMagnus(void);
NSAPI_PUBLIC int ACL_LateInitPostMagnus(void);
NSAPI_PUBLIC void ACL_ListHashUpdate(ACLListHandle_t **acllistp);
-NSAPI_PUBLIC int ACL_ReadDbMapFile(NSErr_t *errp, const char *map_file, int
default_only);
NSAPI_PUBLIC int ACL_MethodNamesGet(NSErr_t *errp, char ***names, int *count);
NSAPI_PUBLIC int ACL_MethodNamesFree(NSErr_t *errp, char **names, int count);
diff --git a/include/libaccess/dbtlibaccess.h b/include/libaccess/dbtlibaccess.h
index 1d78a9b..90b943d 100644
--- a/include/libaccess/dbtlibaccess.h
+++ b/include/libaccess/dbtlibaccess.h
@@ -43,7 +43,9 @@
#define LIBRARY_NAME "libaccess"
+#ifdef RESOURCE_STR
static char dbtlibaccessid[] = "$DBT: libaccess referenced v1 $";
+#endif /* RESOURCE_STR */
#include "i18n.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_config.c
b/ldap/servers/plugins/chainingdb/cb_config.c
index b399ed7..bc12cd7 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 5bbab13..e7fdaa5 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 5838cd7..558e613 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 cef3ee3..48baa24 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 e99573b..4966089 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 75c80ba..5dd5122 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 60a92b3..12018db 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 8313020..deb818d 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 2bb64bc..2261e42 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 521ba1f..bb5ba00 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 8cf9889..77b08cd 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 ed146c4..6524c80 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 afb3f18..c19d34f 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 dfe811e..0c36ddc 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 22ffb4a..a2ae334 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 025c71e..df89549 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)
{
diff --git a/lib/base/crit.cpp b/lib/base/crit.cpp
index 1a1286c..2aa9b5a 100644
--- a/lib/base/crit.cpp
+++ b/lib/base/crit.cpp
@@ -56,13 +56,7 @@
#include "crit.h"
#include "pool.h"
-#include "base/dbtbase.h"
-
#ifdef USE_NSPR
-/*
-#include "prmon.h"
-#include "private/primpl.h"
-*/
#include "nspr.h"
#include "prthread.h"
diff --git a/lib/base/ereport.cpp b/lib/base/ereport.cpp
index ba3df4e..e6b7768 100644
--- a/lib/base/ereport.cpp
+++ b/lib/base/ereport.cpp
@@ -54,8 +54,6 @@
#include "ereport.h"
#include "slapi-plugin.h"
-#include "base/dbtbase.h"
-
#include <stdarg.h>
#include <stdio.h> /* vsprintf */
#include <string.h> /* strcpy */
diff --git a/lib/base/util.cpp b/lib/base/util.cpp
index d3a7c33..b198154 100644
--- a/lib/base/util.cpp
+++ b/lib/base/util.cpp
@@ -56,9 +56,6 @@
#include "base/util.h"
-#include "base/dbtbase.h"
-
-
#ifdef XP_UNIX
#include <sys/types.h>
#endif /* WIN32 */
diff --git a/lib/ldaputil/certmap.c b/lib/ldaputil/certmap.c
index a8cb6cb..9c6b2ba 100644
--- a/lib/ldaputil/certmap.c
+++ b/lib/ldaputil/certmap.c
@@ -234,94 +234,6 @@ NSAPI_PUBLIC int ldapu_list_add_info (LDAPUList_t *list, void *info)
return ldapu_list_add_node(list, node);
}
-static int ldapu_list_remove_node (LDAPUList_t *list, LDAPUListNode_t *node)
-{
- if (list->head == node) {
- list->head = node->next;
- if (list->tail == node) list->tail = 0; /* removed the only node */
- }
- else if (list->tail == node) {
- list->tail = node->prev;
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
-
- node->next = 0;
- node->prev = 0;
- return LDAPU_SUCCESS;
-}
-
-static int ldapu_list_copy (const LDAPUList_t *from, LDAPUList_t **to,
- LDAPUListNodeFn_t copy_fn)
-{
- LDAPUListNode_t *node = from->head;
- LDAPUListNode_t *newnode;
- LDAPUList_t *list = NULL;
- int rv;
-
- *to = 0;
- rv = ldapu_list_alloc(&list);
- if (rv != LDAPU_SUCCESS) goto error;
-
- while(node) {
- newnode = (LDAPUListNode_t *)(*copy_fn)(node->info, 0);
- if (!newnode) {
- rv = LDAPU_ERR_OUT_OF_MEMORY;
- goto error;
- }
-
- rv = ldapu_list_add_info(list, newnode);
- if (rv != LDAPU_SUCCESS) goto error;
-
- node = node->next;
- }
-
- *to = list;
- goto done;
-
-error:
- if (list) ldapu_propval_list_free(list);
-
-done:
- return rv;
-}
-
-static int ldapu_list_find_node (const LDAPUList_t *list,
- LDAPUListNode_t **found,
- LDAPUListNodeFn_t find_fn,
- void *find_arg)
-{
- LDAPUListNode_t *node = list->head;
-
- while(node) {
- if ((*find_fn)(node->info, find_arg) == LDAPU_SUCCESS) {
- *found = node;
- return LDAPU_SUCCESS;
- }
- node = node->next;
- }
-
- return LDAPU_ERR_CERTMAP_INFO_MISSING;
-}
-
-static int ldapu_list_print (LDAPUList_t *list, LDAPUListNodeFn_t print_fn,
- LDAPUPrintInfo_t *pinfo)
-{
- LDAPUListNode_t *node = list->head;
- int rv;
-
- while(node) {
- uintptr_t retval = (uintptr_t)(*print_fn)(node->info, pinfo);
- rv = (int)retval;
- if (rv != LDAPU_SUCCESS) return rv;
- node = node->next;
- }
-
- return LDAPU_SUCCESS;
-}
-
static void ldapu_list_free (LDAPUList_t *list, LDAPUListNodeFn_t free_fn)
{
@@ -362,44 +274,6 @@ NSAPI_PUBLIC int ldapu_propval_alloc (const char *prop, const char
*val,
}
}
-static void *ldapu_propval_copy (void *info, void *arg)
-{
- LDAPUPropVal_t *propval = (LDAPUPropVal_t *)info;
- LDAPUPropVal_t *copy = 0;
- int rv;
-
- rv = ldapu_propval_alloc(propval->prop, propval->val, ©);
-
- if (rv != LDAPU_SUCCESS) {
- if (copy) ldapu_propval_free(copy, 0);
- return 0;
- }
-
- return copy;
-}
-
-#define PRINT_STR(x) (x ? x : "<NULL>")
-
-static void * ldapu_propval_print (void *info, void *arg)
-{
- LDAPUPropVal_t *propval = (LDAPUPropVal_t *)info;
- LDAPUPrintInfo_t *pinfo = (LDAPUPrintInfo_t *)arg;
-
- if (!pinfo || !pinfo->fp) {
- fprintf(stderr, "\tprop = \"%s\", \tval = \"%s\"\n",
- PRINT_STR(propval->prop),
- PRINT_STR(propval->val));
- }
- else {
- char *issuerName = (char *)pinfo->arg;
-
- fprintf(pinfo->fp, "%s:%s %s\n", issuerName,
- propval->prop ? propval->prop : "",
- propval->val ? propval->val : "");
- }
-
- return 0;
-}
static int PresentInComps (long comps_bitmask, int tag)
{
@@ -411,79 +285,6 @@ static int PresentInComps (long comps_bitmask, int tag)
return 0;
}
-static void print_oid_bitmask (long bitmask)
-{
- fprintf(stderr, "%lx: ", bitmask);
-
- if (PresentInComps(bitmask, SEC_OID_AVA_COUNTRY_NAME))
- fprintf(stderr, " C");
- if (PresentInComps(bitmask, SEC_OID_AVA_ORGANIZATION_NAME))
- fprintf(stderr, " O");
- if (PresentInComps(bitmask, SEC_OID_AVA_COMMON_NAME))
- fprintf(stderr, " CN");
- if (PresentInComps(bitmask, SEC_OID_AVA_LOCALITY))
- fprintf(stderr, " L");
- if (PresentInComps(bitmask, SEC_OID_AVA_STATE_OR_PROVINCE))
- fprintf(stderr, " ST");
- if (PresentInComps(bitmask, SEC_OID_AVA_ORGANIZATIONAL_UNIT_NAME))
- fprintf(stderr, " OU");
- if (PresentInComps(bitmask, SEC_OID_PKCS9_EMAIL_ADDRESS))
- fprintf(stderr, " E");
- if (PresentInComps(bitmask, SEC_OID_RFC1274_UID))
- fprintf(stderr, " UID");
- if (PresentInComps(bitmask, SEC_OID_RFC1274_MAIL))
- fprintf(stderr, " MAIL");
- if (PresentInComps(bitmask, SEC_OID_AVA_DC))
- fprintf(stderr, " DC");
- /* check for not yet known oid */
- if (PresentInComps(bitmask, 34325))
- fprintf(stderr, " UNKNOWN");
-
- fprintf(stderr, "\n");
-}
-
-static void *ldapu_certinfo_print (void *info, void *arg)
-{
- LDAPUCertMapInfo_t *certinfo = (LDAPUCertMapInfo_t*)info;
- LDAPUPrintInfo_t *pinfo = (LDAPUPrintInfo_t *)arg;
-
- if (!certinfo) return (void *)LDAPU_ERR_WRONG_ARGS;
-
- if (!pinfo || !pinfo->fp) {
- fprintf(stderr, "Printing cert mapinfo: \"%s\" ...\n",
- PRINT_STR(certinfo->issuerName));
- fprintf(stderr, "\tissuerDN = \"%s\"\n",
- PRINT_STR(certinfo->issuerDN));
- fprintf(stderr, "\tParsed dncomps: ");
- print_oid_bitmask(certinfo->dncomps);
- fprintf(stderr, "\tParsed filtercomps: ");
- print_oid_bitmask(certinfo->filtercomps);
-
- if (certinfo->propval) {
- fprintf(stderr, "\tPrinting propval pairs: ...\n");
- if (certinfo->propval)
- ldapu_list_print(certinfo->propval, ldapu_propval_print, pinfo);
- }
- else {
- fprintf(stderr, "\tNo propval pairs\n");
- }
- }
- else {
- LDAPUPrintInfo_t pinfo2;
-
- pinfo2.fp = pinfo->fp;
- pinfo2.arg = certinfo->issuerName;
-
- /* Write certinfo to pinfo->fp */
- fprintf(pinfo->fp, "%s %s %s\n", LIB_DIRECTIVE, certinfo->issuerName,
- certinfo->issuerDN ? certinfo->issuerDN : "");
- if (certinfo->propval)
- ldapu_list_print(certinfo->propval, ldapu_propval_print, &pinfo2);
- fprintf(pinfo->fp, "\n");
- }
-
- return (void *)LDAPU_SUCCESS;
-}
static int dbconf_to_certmap_err (int err)
{
@@ -1631,19 +1432,6 @@ done:
return rv;
}
-/* ldapu_propval_same - returns LDAPU_SUCCESS or LDAPU_FAILED */
-static void * ldapu_propval_same (void *info, void *find_arg)
-{
- /* check if info has find_arg as the issuerDN */
- const char *issuerDN = (const char *)find_arg;
- const LDAPUCertMapInfo_t *certinfo = (const LDAPUCertMapInfo_t *) info;
-
- if (!ldapu_strcasecmp(certinfo->issuerDN, issuerDN))
- return (void *)LDAPU_SUCCESS;
- else
- return (void *)LDAPU_FAILED;
-}
-
static void * ldapu_propval_free (void *propval_in, void *arg)
{
LDAPUPropVal_t *propval = (LDAPUPropVal_t *)propval_in;
diff --git a/lib/libaccess/aclcache.cpp b/lib/libaccess/aclcache.cpp
index 1058887..f814df7 100644
--- a/lib/libaccess/aclcache.cpp
+++ b/lib/libaccess/aclcache.cpp
@@ -52,6 +52,7 @@
#include <libaccess/usrcache.h>
#include <libaccess/las.h>
#include "aclutil.h"
+#define NO_ACL_HASH_FUNCS
#include "permhash.h"
#include "aclcache.h"
diff --git a/lib/libaccess/aclflush.cpp b/lib/libaccess/aclflush.cpp
index 8e5ce7c..a2f4461 100644
--- a/lib/libaccess/aclflush.cpp
+++ b/lib/libaccess/aclflush.cpp
@@ -52,7 +52,6 @@
#include <libaccess/aclglobal.h>
#include <libaccess/las.h>
#include "aclcache.h"
-#include <libaccess/dbtlibaccess.h>
extern void ACL_DatabaseDestroy(void);
diff --git a/lib/libaccess/aclpriv.h b/lib/libaccess/aclpriv.h
index a95b363..8744ef0 100644
--- a/lib/libaccess/aclpriv.h
+++ b/lib/libaccess/aclpriv.h
@@ -61,6 +61,7 @@
#define ACL_MIN_IDX 0
#define ACL_EXPR_STACK 1024
#define ACL_TABLE_THRESHOLD 10
+#define ACL_NO_UNPUT 1 /* unput is not used and causes compiler warnings */
typedef enum {
ACL_EXPR_OP_AND,
diff --git a/lib/libaccess/authdb.cpp b/lib/libaccess/authdb.cpp
index da435c3..4196c3a 100644
--- a/lib/libaccess/authdb.cpp
+++ b/lib/libaccess/authdb.cpp
@@ -47,7 +47,6 @@
#include <plhash.h>
#include <netsite.h>
-#include "permhash.h"
#include <ldaputil/errors.h>
#include <ldaputil/certmap.h>
#include <ldaputil/dbconf.h>
@@ -250,117 +249,6 @@ NSAPI_PUBLIC int ACL_DatabaseFind(NSErr_t *errp, const char *name,
return LAS_EVAL_FAIL;
}
-
-NSAPI_PUBLIC int ACL_ReadDbMapFile (NSErr_t *errp, const char *map_file,
- int default_only)
-{
- DBConfInfo_t *info;
- DBConfDBInfo_t *db_info;
- DBPropVal_t *propval;
- PList_t plist;
- int rv;
- int seen_default = 0;
-
- if (default_only)
- rv = dbconf_read_default_dbinfo(map_file, &db_info);
- else
- rv = dbconf_read_config_file(map_file, &info);
-
- if (rv != LDAPU_SUCCESS) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4600, ACL_Program, 3,
XP_GetAdminStr(DBT_ReadDbMapFileErrorReadingFile), map_file, ldapu_err2string(rv));
- return -1;
- }
-
- rv = 0;
-
- if (!default_only)
- db_info = info->firstdb;
-
- while(db_info) {
- char *url = db_info->url;
- char *dbname = db_info->dbname;
- ACLDbType_t dbtype;
-
- /* process db_info */
- if (url) {
- rv = acl_url_to_dbtype(url, &dbtype);
-
- if (rv < 0) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4610, ACL_Program, 2,
- XP_GetAdminStr(DBT_ReadDbMapFileCouldntDetermineDbtype), url);
- break;
- }
- }
- else {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4620, ACL_Program, 2,
- XP_GetAdminStr(DBT_ReadDbMapFileMissingUrl), dbname);
- rv = -1;
- break;
- }
-
- /* convert any property-value pairs in db_info into plist */
- plist = PListNew(NULL);
- propval = db_info->firstprop;
-
- while(propval) {
- if (propval->prop) {
- PListInitProp(plist, 0, propval->prop, propval->val, 0);
- }
- else {
- nserrGenerate(errp, ACLERRINVAL, ACLERR4630, ACL_Program, 2,
- XP_GetAdminStr(DBT_ReadDbMapFileInvalidPropertyPair), dbname);
- rv = -1;
- break;
- }
- propval = propval->next;
- }
-
- if (rv < 0) break;
-
- /* register the database */
- rv = ACL_DatabaseRegister(errp, dbtype, dbname, url, plist);
- PListDestroy(plist);
-
- if (rv < 0) {
- /* Failed to register database */
- nserrGenerate(errp, ACLERRFAIL, ACLERR4640, ACL_Program, 2,
- XP_GetAdminStr(DBT_ReadDbMapFileRegisterDatabaseFailed), dbname);
- break;
- }
-
- /* If the dbname is "default", set the default_dbtype */
- if (!strcmp(dbname, DBCONF_DEFAULT_DBNAME)) {
- if (!ACL_DbTypeIsEqual(errp, dbtype, ACL_DbTypeLdap)) {
- nserrGenerate(errp, ACLERRINVAL, ACLERR4350, ACL_Program, 1,
- XP_GetAdminStr(DBT_ReadDbMapFileDefaultDatabaseNotLdap));
- rv = -1;
- break;
- }
- if (seen_default) {
- nserrGenerate(errp, ACLERRINVAL, ACLERR4360, ACL_Program, 1,
XP_GetAdminStr(DBT_ReadDbMapFileMultipleDefaultDatabases));
- rv = -1;
- break;
- }
- seen_default = 1;
- ACL_DatabaseSetDefault(errp, dbname);
- }
-
- db_info = db_info->next;
- }
-
- if (!seen_default) {
- nserrGenerate(errp, ACLERRINVAL, ACLERR4370, ACL_Program, 1,
XP_GetAdminStr(DBT_ReadDbMapFileMissingDefaultDatabase));
- rv = -1;
- }
-
- if (default_only)
- dbconf_free_dbinfo(db_info);
- else
- dbconf_free_confinfo(info);
-
- return rv;
-}
-
void
ACL_DatabaseDestroy(void)
{
diff --git a/lib/libaccess/oneeval.cpp b/lib/libaccess/oneeval.cpp
index 8056e0e..ed29ee4 100644
--- a/lib/libaccess/oneeval.cpp
+++ b/lib/libaccess/oneeval.cpp
@@ -70,6 +70,7 @@
#include "aclutil.h"
#include "aclcache.h"
#include "oneeval.h"
+#define NO_ACL_HASH_FUNCS
#include "permhash.h"
static ACLDispatchVector_t __nsacl_vector = {
diff --git a/lib/libaccess/permhash.h b/lib/libaccess/permhash.h
index f76ab4c..9446fb5 100644
--- a/lib/libaccess/permhash.h
+++ b/lib/libaccess/permhash.h
@@ -80,13 +80,7 @@ static PLHashAllocOps ACLPermAllocOps = {
ACL_PermFreeEntry
};
-static int
-PR_StringFree(PLHashEntry *he, int i, void *arg)
-{
- PERM_FREE(he->key);
- return 0;
-}
-
+#ifndef NO_ACL_HASH_FUNCS
static PLHashNumber
PR_HashCaseString(const void *key)
{
@@ -111,6 +105,7 @@ PR_CompareCaseStrings(const void *v1, const void *v2)
return (strcasecmp(s1, s2) == 0);
#endif
}
-
+#endif /* NO_ACL_HASH_FUNCS */
+
#endif /* _PERMHASH_H */
diff --git a/lib/libaccess/register.cpp b/lib/libaccess/register.cpp
index 09d918f..3f2acc5 100644
--- a/lib/libaccess/register.cpp
+++ b/lib/libaccess/register.cpp
@@ -56,7 +56,6 @@
#include <libaccess/aclproto.h>
#include <libaccess/aclglobal.h>
#include "aclcache.h"
-#include <libaccess/dbtlibaccess.h>
#include <libaccess/aclerror.h>
/* This is to force aclspace.o into ns-httpd30.dll */