* 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

diff --git a/include/util_ldap.h b/include/util_ldap.h
index e6c35c3436c11ebe2bd7afc20700271e2c6a3f48..3e678c9ff7e9d2322ab67cc1760abc44d103bb04 100644 (file)
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -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;
 

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index b6d60ca73bd26b77b669d34c91ac2c22f7ce5bac..09bcd9fa490de9c120d6bd0b9594a1b2fc7ab28e 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -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;