diff options
Diffstat (limited to 'lib/ldaputil')
| -rw-r--r-- | lib/ldaputil/cert.c | 4 | ||||
| -rw-r--r-- | lib/ldaputil/certmap.c | 11 | ||||
| -rw-r--r-- | lib/ldaputil/vtable.c | 3 |
3 files changed, 6 insertions, 12 deletions
diff --git a/lib/ldaputil/cert.c b/lib/ldaputil/cert.c index 20a2c2bd..ceb57118 100644 --- a/lib/ldaputil/cert.c +++ b/lib/ldaputil/cert.c @@ -259,9 +259,9 @@ _rdns_count (char*** rdns) { 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; } } diff --git a/lib/ldaputil/certmap.c b/lib/ldaputil/certmap.c index b0adf662..57d1f910 100644 --- a/lib/ldaputil/certmap.c +++ b/lib/ldaputil/certmap.c @@ -1051,12 +1051,10 @@ NSAPI_PUBLIC int ldapu_issuer_certinfo (const char *issuerDN, void **certmap_inf 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 @@ static CertMapFn_t ldapu_get_cert_mapfn_sub (LDAPUCertMapInfo_t *certmap_info) 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 @@ static CertSearchFn_t ldapu_get_cert_searchfn_sub (LDAPUCertMapInfo_t *certmap_i 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 @@ static CertVerifyFn_t ldapu_get_cert_verifyfn_sub (LDAPUCertMapInfo_t *certmap_i 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); diff --git a/lib/ldaputil/vtable.c b/lib/ldaputil/vtable.c index 7ef13553..0ead6c11 100644 --- a/lib/ldaputil/vtable.c +++ b/lib/ldaputil/vtable.c @@ -68,7 +68,7 @@ ldapuVd_init ( const char *host, int port ) #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 @@ ldapuVd_get_values_len( LDAP *ld, LDAPMessage *entry, const char *desc ) #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 |