diff options
author | Noriko Hosoi <nhosoi@redhat.com> | 2007-10-18 00:08:38 +0000 |
---|---|---|
committer | Noriko Hosoi <nhosoi@redhat.com> | 2007-10-18 00:08:38 +0000 |
commit | 19cd513a509aa6e45361df774e74f2d39451e08a (patch) | |
tree | 13ad0e58a486afd842559e1d74d019190c3f1d79 /ldap/servers/slapd/back-ldbm | |
parent | 878c163528ed089dae1edb8295a6dd4ae842b9b4 (diff) | |
download | ds-19cd513a509aa6e45361df774e74f2d39451e08a.tar.gz ds-19cd513a509aa6e45361df774e74f2d39451e08a.tar.xz ds-19cd513a509aa6e45361df774e74f2d39451e08a.zip |
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler
Diffstat (limited to 'ldap/servers/slapd/back-ldbm')
-rw-r--r-- | ldap/servers/slapd/back-ldbm/dbhelp.c | 7 | ||||
-rw-r--r-- | ldap/servers/slapd/back-ldbm/dblayer.c | 4 | ||||
-rw-r--r-- | ldap/servers/slapd/back-ldbm/dbverify.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/back-ldbm/import.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/back-ldbm/ldbm_attr.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 14 | ||||
-rw-r--r-- | ldap/servers/slapd/back-ldbm/sort.c | 5 |
7 files changed, 15 insertions, 21 deletions
diff --git a/ldap/servers/slapd/back-ldbm/dbhelp.c b/ldap/servers/slapd/back-ldbm/dbhelp.c index 0a96df8f..36e8dd04 100644 --- a/ldap/servers/slapd/back-ldbm/dbhelp.c +++ b/ldap/servers/slapd/back-ldbm/dbhelp.c @@ -57,8 +57,8 @@ static int dblayer_copy_file_keybykey(DB_ENV *env, char *source_file_name, char DB *destination_file = NULL; DBC *source_cursor = NULL; DBTYPE dbtype = 0; - int dbflags = 0; - int dbpagesize = 0; + PRUint32 dbflags = 0; + PRUint32 dbpagesize = 0; int cursor_flag = 0; int finished = 0; int mode = 0; @@ -187,14 +187,11 @@ error: int dblayer_copy_file_resetlsns(char *home_dir ,char *source_file_name, char *destination_file_name, int overwrite, dblayer_private *priv) { int retval = 0; - int mode = 0; DB_ENV *env = NULL; LDAPDebug( LDAP_DEBUG_TRACE, "=> dblayer_copy_file_resetlsns\n", 0, 0, 0 ); /* Make the environment */ - if (priv->dblayer_file_mode) - mode = priv->dblayer_file_mode; retval = dblayer_make_private_simple_env(home_dir,&env); if (retval) { LDAPDebug(LDAP_DEBUG_ANY, "dblayer_copy_file_resetlsns: Call to dblayer_make_private_simple_env failed!\n" diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index af82af54..42111735 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -478,6 +478,7 @@ static int dblayer_seek24_large(int fd, size_t pgsize, db_pgno_t pageno, return (ret < 0) ? errno : 0; } +#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4300 /* Helper function for large seeks, db4.3 */ static int dblayer_seek43_large(int fd, off64_t offset, int whence) { @@ -487,6 +488,7 @@ static int dblayer_seek43_large(int fd, off64_t offset, int whence) return (ret < 0) ? errno : 0; } +#endif /* helper function for large fstat -- this depends on 'struct stat64' having * the following members: @@ -5828,7 +5830,6 @@ done: int dblayer_update_db_ext(ldbm_instance *inst, char *oldext, char *newext) { struct attrinfo *a = NULL; - backend *be = NULL; struct ldbminfo *li = NULL; dblayer_private *priv = NULL; DB *thisdb = NULL; @@ -5844,7 +5845,6 @@ int dblayer_update_db_ext(ldbm_instance *inst, char *oldext, char *newext) "update_db_ext: Null instance is passed\n", 0, 0, 0); return -1; /* non zero */ } - be = inst->inst_be; li = inst->inst_li; priv = (dblayer_private*)li->li_dblayer_private; inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN); diff --git a/ldap/servers/slapd/back-ldbm/dbverify.c b/ldap/servers/slapd/back-ldbm/dbverify.c index bd3ec2e0..c6f910b9 100644 --- a/ldap/servers/slapd/back-ldbm/dbverify.c +++ b/ldap/servers/slapd/back-ldbm/dbverify.c @@ -169,7 +169,7 @@ ldbm_back_dbverify( Slapi_PBlock *pb ) slapi_log_error(SLAPI_LOG_TRACE, "verify DB", "Verifying db files...\n"); slapi_pblock_get(pb, SLAPI_BACKEND_INSTANCE_NAME, &instance_names); - slapi_pblock_get(pb, SLAPI_SEQ_VAL, &verbose); + slapi_pblock_get(pb, SLAPI_SEQ_TYPE, &verbose); slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &li); ldbm_config_load_dse_info(li); ldbm_config_internal_set(li, CONFIG_DB_TRANSACTION_LOGGING, "off"); diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c index 9513a8bf..7666dcfe 100644 --- a/ldap/servers/slapd/back-ldbm/import.c +++ b/ldap/servers/slapd/back-ldbm/import.c @@ -173,8 +173,6 @@ static void import_log_status_add_line(ImportJob *job, char *format, ...) static void import_log_status_done(ImportJob *job) { if (job->task) { - int len = 0; - len = strlen(job->task_status); slapi_task_log_status(job->task, "%s", job->task_status); } } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attr.c b/ldap/servers/slapd/back-ldbm/ldbm_attr.c index 93032d60..28b79f19 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_attr.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_attr.c @@ -572,7 +572,7 @@ static int grok_and_rewrite_filter(Slapi_Filter *f) rhs = f->f_ava.ava_value.bv_val; /* is the value zero ? */ rhs_num = atoi(rhs); - if (0 == rhs) { + if (0 == rhs_num) { /* If so, rewrite to same as numsubordinates=* */ free_the_filter_bits(f); replace_filter(f,"(objectclass=*)"); diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c index 5e1d998c..154c8af6 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c @@ -200,7 +200,7 @@ attrcrypt_keymgmt_store_key(ldbm_instance *li, attrcrypt_cipher_state *acs, SECK char *entry_string = slapi_ch_smprintf(entry_template,acs->ace->cipher_display_name,instance_name,acs->ace->cipher_display_name); e = slapi_str2entry(entry_string, 0); /* Add the key as a binary attribute */ - key_as_berval.bv_val = wrapped_symmetric_key.data; + key_as_berval.bv_val = (char *)wrapped_symmetric_key.data; key_as_berval.bv_len = wrapped_symmetric_key.len; key_value = slapi_value_new_berval(&key_as_berval); /* key_value is now a copy of key_as_berval - free wrapped_symmetric_key */ @@ -236,7 +236,7 @@ attrcrypt_wrap_key(attrcrypt_cipher_state *acs, PK11SymKey *symmetric_key, SECKE CK_MECHANISM_TYPE wrap_mechanism = CKM_RSA_PKCS; SECKEYPublicKey *wrapping_key = public_key; wrapped_symmetric_key->len = slapd_SECKEY_PublicKeyStrength(public_key); - wrapped_symmetric_key->data = slapi_ch_malloc(wrapped_symmetric_key->len); + wrapped_symmetric_key->data = (unsigned char *)slapi_ch_malloc(wrapped_symmetric_key->len); LDAPDebug(LDAP_DEBUG_TRACE,"-> attrcrypt_wrap_key\n", 0, 0, 0); s = slapd_pk11_PubWrapSymKey(wrap_mechanism, wrapping_key, symmetric_key, wrapped_symmetric_key); if (SECSuccess != s) { @@ -567,7 +567,7 @@ attrcrypt_crypto_op(attrcrypt_private *priv, backend *be, struct attrinfo *ai, c SECItem *security_parameter = NULL; int output_buffer_length = 0; int output_buffer_size1 = 0; - int output_buffer_size2 = 0; + unsigned int output_buffer_size2 = 0; unsigned char *output_buffer = NULL; attrcrypt_cipher_state *acs = NULL; @@ -586,7 +586,7 @@ attrcrypt_crypto_op(attrcrypt_private *priv, backend *be, struct attrinfo *ai, c #endif /* Allocate the output buffer */ output_buffer_length = in_size + 16; - output_buffer = slapi_ch_malloc(output_buffer_length); + output_buffer = (unsigned char *)slapi_ch_malloc(output_buffer_length); /* Now call NSS to do the cipher op */ iv_item.data = "aaaaaaaaaaaaaaaa"; /* ptr to an array of IV bytes */ iv_item.len = acs->ace->iv_length; /* length of the array of IV bytes */ @@ -602,7 +602,7 @@ attrcrypt_crypto_op(attrcrypt_private *priv, backend *be, struct attrinfo *ai, c LDAPDebug(LDAP_DEBUG_ANY,"attrcrypt_crypto_op failed on cipher %s : %d - %s\n", acs->ace->cipher_display_name, errorCode, slapd_pr_strerror(errorCode)); goto error; } - secret = slapd_pk11_cipherOp(sec_context, output_buffer, &output_buffer_size1, output_buffer_length, in_data, in_size); + secret = slapd_pk11_cipherOp(sec_context, output_buffer, &output_buffer_size1, output_buffer_length, (unsigned char *)in_data, in_size); if (SECSuccess != secret) { int errorCode = PR_GetError(); LDAPDebug(LDAP_DEBUG_ANY,"attrcrypt_crypto_op failed on cipher %s : %d - %s\n", acs->ace->cipher_display_name, errorCode, slapd_pr_strerror(errorCode)); @@ -621,11 +621,11 @@ attrcrypt_crypto_op(attrcrypt_private *priv, backend *be, struct attrinfo *ai, c if (encrypt) { log_bytes("slapd_pk11_DigestFinal '%s' (%d)\n", output_buffer, output_buffer_size1 + output_buffer_size2); } else { - LDAPDebug(LDAP_DEBUG_ANY,"slapd_pk11_DigestFinal '%s', %d\n", output_buffer, output_buffer_size2, 0); + LDAPDebug(LDAP_DEBUG_ANY,"slapd_pk11_DigestFinal '%s', %u\n", output_buffer, output_buffer_size2, 0); } #endif *out_size = output_buffer_size1 + output_buffer_size2; - *out_data = output_buffer; + *out_data = (char *)output_buffer; } error: if (sec_context) { diff --git a/ldap/servers/slapd/back-ldbm/sort.c b/ldap/servers/slapd/back-ldbm/sort.c index f2ee1fd4..b9f3e211 100644 --- a/ldap/servers/slapd/back-ldbm/sort.c +++ b/ldap/servers/slapd/back-ldbm/sort.c @@ -673,7 +673,6 @@ static int compare_entries_sv(ID *id_a, ID *id_b, sort_spec *s,baggage_carrier * struct backentry *b = NULL; int result = 0; sort_spec_thing *this_one = NULL; - int return_value = -1; backend *be = bc->be; ldbm_instance *inst = (ldbm_instance *) be->be_instance_info; int err; @@ -706,8 +705,8 @@ static int compare_entries_sv(ID *id_a, ID *id_b, sort_spec *s,baggage_carrier * struct berval **value_b = NULL; /* Get the two attribute values from the entries */ - return_value = slapi_entry_attr_find(a->ep_entry,type,&attr_a); - return_value = slapi_entry_attr_find(b->ep_entry,type,&attr_b); + slapi_entry_attr_find(a->ep_entry,type,&attr_a); + slapi_entry_attr_find(b->ep_entry,type,&attr_b); /* What do we do if one or more of the entries lacks this attribute ? */ /* if one lacks the attribute */ if (NULL == attr_a) { |