7:08 p.m.
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/ldap/servers/slapd/back-ldbm
Modified Files:
dbhelp.c dblayer.c dbverify.c import.c ldbm_attr.c
ldbm_attrcrypt.c sort.c
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler
Index: dbhelp.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dbhelp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dbhelp.c 16 Aug 2007 19:28:58 -0000 1.8
+++ dbhelp.c 18 Oct 2007 00:08:34 -0000 1.9
@@ -57,8 +57,8 @@
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 @@
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"
Index: dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dblayer.c 16 Oct 2007 17:30:58 -0000 1.24
+++ dblayer.c 18 Oct 2007 00:08:34 -0000 1.25
@@ -478,6 +478,7 @@
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 @@
return (ret < 0) ? errno : 0;
}
+#endif
/* helper function for large fstat -- this depends on 'struct stat64' having
* the following members:
@@ -5828,7 +5830,6 @@
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 @@
"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);
Index: dbverify.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dbverify.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbverify.c 7 Sep 2007 19:08:45 -0000 1.1
+++ dbverify.c 18 Oct 2007 00:08:34 -0000 1.2
@@ -169,7 +169,7 @@
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");
Index: import.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.c 19 Sep 2007 19:32:03 -0000 1.9
+++ import.c 18 Oct 2007 00:08:34 -0000 1.10
@@ -173,8 +173,6 @@
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);
}
}
Index: ldbm_attr.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_attr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ldbm_attr.c 2 Oct 2007 18:39:51 -0000 1.8
+++ ldbm_attr.c 18 Oct 2007 00:08:34 -0000 1.9
@@ -572,7 +572,7 @@
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=*)");
Index: ldbm_attrcrypt.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ldbm_attrcrypt.c 10 Nov 2006 23:45:39 -0000 1.9
+++ ldbm_attrcrypt.c 18 Oct 2007 00:08:34 -0000 1.10
@@ -200,7 +200,7 @@
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 @@
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 @@
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 @@
#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 @@
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 @@
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) {
Index: sort.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/sort.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sort.c 1 Dec 2006 21:57:57 -0000 1.10
+++ sort.c 18 Oct 2007 00:08:34 -0000 1.11
@@ -673,7 +673,6 @@
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 @@
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) {