ldap/servers/slapd/dse.c | 4 ++--
ldap/servers/slapd/pw.c | 2 --
ldap/servers/slapd/pw_retry.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit accb8634e059966a24d25a906a28fbf60cb4bc77
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Feb 18 16:18:19 2015 -0800
Ticket #47965 - Fix coverity issues and compiler warnings - 2014/12/16, 2014/11/24,
2015/2/18
Description: Fixed compiler warnings in dse.c, pw.c, and pw_retry.c.
diff --git a/ldap/servers/slapd/dse.c b/ldap/servers/slapd/dse.c
index efa64ff..22cbff1 100644
--- a/ldap/servers/slapd/dse.c
+++ b/ldap/servers/slapd/dse.c
@@ -704,9 +704,9 @@ dse_read_one_file(struct dse *pdse, const char *filename, Slapi_PBlock
*pb,
if ( (NULL != pdse) && (NULL != filename) )
{
/* check if the "real" file exists and cam be used, if not try tmp as
backup */
- rc = dse_check_file(filename, pdse->dse_tmpfile);
+ rc = dse_check_file((char *)filename, pdse->dse_tmpfile);
if (!rc)
- rc = dse_check_file(filename, pdse->dse_fileback);
+ rc = dse_check_file((char *)filename, pdse->dse_fileback);
if ( (rc = PR_GetFileInfo( filename, &prfinfo )) != PR_SUCCESS )
{
diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
index 4df24b7..a1e3dd6 100644
--- a/ldap/servers/slapd/pw.c
+++ b/ldap/servers/slapd/pw.c
@@ -452,7 +452,6 @@ pw_rever_decode(char *cipher, char **plain, const char * attr_name)
{
if (slapi_attr_types_equivalent(L_attr, attr_name))
{
- typedef int (*CMPFP)(char *, char *);
typedef char * (*ENCFP)(char *);
pwsp = (struct pw_scheme *) slapi_ch_calloc (1, sizeof(struct pw_scheme));
@@ -528,7 +527,6 @@ pw_rever_encode(Slapi_Value **vals, char * attr_name)
{
if (slapi_attr_types_equivalent(L_attr, attr_name))
{
- typedef int (*CMPFP)(char *, char *);
typedef char * (*ENCFP)(char *);
pwsp = (struct pw_scheme *) slapi_ch_calloc (1, sizeof(struct pw_scheme));
diff --git a/ldap/servers/slapd/pw_retry.c b/ldap/servers/slapd/pw_retry.c
index 74e575e..68a6bd9 100644
--- a/ldap/servers/slapd/pw_retry.c
+++ b/ldap/servers/slapd/pw_retry.c
@@ -221,7 +221,7 @@ Slapi_Entry *get_entry ( Slapi_PBlock *pb, const char *dn)
int search_result = 0;
Slapi_Entry *retentry = NULL;
Slapi_DN *target_sdn = NULL;
- char *target_dn = (char *)dn;
+ const char *target_dn = dn;
Slapi_DN sdn;
if (pb) {