Commit 62c41ca4 authored by Joe Orton's avatar Joe Orton
Browse files

* include/util_ldap.h (util_ldap_state_t): Fix gcc format string

warnings: use a long for connectionTimeout since the code expects a
long.

* modules/ldap/util_ldap.c (compare_client_certs): Make static to fix
gcc missing-prototype warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153390 13f79535-47bb-0310-9956-ffa450edef68
parent bb9d4e26
Loading
Loading
Loading
Loading
+1 −1
Changes for include/util_ldap.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ typedef struct util_ldap_state_t {
    /* cache ald */
    void *util_ldap_cache;
    char *lock_file;           /* filename for shm lock mutex */
    int connectionTimeout;
    long  connectionTimeout;

} util_ldap_state_t;

+2 −2
Changes for modules/ldap/util_ldap.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -367,8 +367,8 @@ LDAP_DECLARE(int) util_ldap_connection_open(request_rec *r,
 *
 * Returns 1 on compare failure, 0 otherwise.
 */
int compare_client_certs(apr_array_header_t *srcs, apr_array_header_t *dests) {

static int compare_client_certs(apr_array_header_t *srcs, apr_array_header_t *dests)
{
    int i = 0;
    struct apr_ldap_opt_tls_cert_t *src, *dest;