Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/ldaputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/lib/ldaputil
Modified Files:
cert.c certmap.c vtable.c
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler
Index: cert.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/cert.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cert.c 10 Nov 2006 23:46:00 -0000 1.5
+++ cert.c 18 Oct 2007 00:08:36 -0000 1.6
@@ -259,9 +259,9 @@
{
auto size_t count = 0;
auto char*** rdn;
- for (rdn = rdns; *rdns; ++rdns) {
+ for (rdn = rdns; *rdn; ++rdn) {
auto char** ava;
- for (ava = *rdns; *ava; ++ava) {
+ for (ava = *rdn; *ava; ++ava) {
++count;
}
}
Index: certmap.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/certmap.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- certmap.c 10 Nov 2006 23:46:00 -0000 1.7
+++ certmap.c 18 Oct 2007 00:08:36 -0000 1.8
@@ -1051,12 +1051,10 @@
else if (certmap_listinfo) {
char *n_issuerDN = ldapu_dn_normalize (ldapu_strdup(issuerDN));
LDAPUListNode_t *cur = certmap_listinfo->head;
- int rv = LDAPU_FAILED;
while(cur) {
if (!ldapu_strcasecmp(n_issuerDN, ((LDAPUCertMapInfo_t
*)cur->info)->issuerDN))
{
*certmap_info = cur->info;
- rv = LDAPU_SUCCESS;
break;
}
cur = cur->next;
@@ -1302,10 +1300,9 @@
NSAPI_PUBLIC CertMapFn_t ldapu_get_cert_mapfn (const char *issuerDN)
{
LDAPUCertMapInfo_t *certmap_info = 0;
- int rv;
/* don't free the certmap_info -- its a pointer to an internal structure */
- rv = ldapu_issuer_certinfo(issuerDN, (void **)&certmap_info);
+ ldapu_issuer_certinfo(issuerDN, (void **)&certmap_info);
/* certmap_info may be NULL -- use the default */
return ldapu_get_cert_mapfn_sub(certmap_info);
@@ -1344,10 +1341,9 @@
NSAPI_PUBLIC CertSearchFn_t ldapu_get_cert_searchfn (const char *issuerDN)
{
LDAPUCertMapInfo_t *certmap_info = 0;
- int rv;
/* don't free the certmap_info -- its a pointer to an internal structure */
- rv = ldapu_issuer_certinfo(issuerDN, (void **)&certmap_info);
+ ldapu_issuer_certinfo(issuerDN, (void **)&certmap_info);
/* certmap_info may be NULL -- use the default */
return ldapu_get_cert_searchfn_sub(certmap_info);
@@ -1386,10 +1382,9 @@
NSAPI_PUBLIC CertVerifyFn_t ldapu_get_cert_verifyfn (const char *issuerDN)
{
LDAPUCertMapInfo_t *certmap_info = 0;
- int rv;
/* don't free the certmap_info -- its a pointer to an internal structure */
- rv = ldapu_issuer_certinfo(issuerDN, (void **)&certmap_info);
+ ldapu_issuer_certinfo(issuerDN, (void **)&certmap_info);
/* certmap_info may be NULL -- use the default */
return ldapu_get_cert_verifyfn_sub(certmap_info);
Index: vtable.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/vtable.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vtable.c 10 Nov 2006 23:46:00 -0000 1.5
+++ vtable.c 18 Oct 2007 00:08:36 -0000 1.6
@@ -68,7 +68,7 @@
#endif
static LDAP_CALL LDAP_CALLBACK int
-ldapuVd_set_option( LDAP *ld, int opt, void *val )
+ldapuVd_set_option( LDAP *ld, int opt, const void *val )
{
return ldap_set_option (ld, opt, val);
}
@@ -150,7 +150,6 @@
#define ldapuVd_set_option ldap_set_option
#define ldapuVd_simple_bind_s ldap_simple_bind_s
#define ldapuVd_unbind ldap_unbind
-#define ldapuVd_set_option ldap_set_option
#define ldapuVd_simple_bind_s ldap_simple_bind_s
#define ldapuVd_unbind ldap_unbind
#define ldapuVd_search_s ldap_search_s
Show replies by date