From: Graham Leggett <minfrin@apache.org>
Date: Sat, 14 Sep 2013 15:11:30 +0000 (+0000)
Subject: mod_ldap: add TRACE5 for LDAP retries
X-Git-Tag: 2.4.7~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d4683dc46175e354257ad78d7ab38a893a5d083;p=apache

mod_ldap: add TRACE5 for LDAP retries

trunk patch: http://svn.apache.org/r1510085

Submitted by: covener
Reviewed by: jim, humbedooh


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1523266 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 97b811389e..137d9656ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.7
 
+  *) mod_ldap: add TRACE5 for LDAP retries. [Eric Covener]
+
   *) mod_ldap: retry on an LDAP timeout during authn. [Eric Covener]
 
   *) mod_ldap: Change "LDAPReferrals off" to actually set the underlying LDAP 
diff --git a/STATUS b/STATUS
index 90e3458089..5bc7c02cfb 100644
--- a/STATUS
+++ b/STATUS
@@ -133,12 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     +1: covener, jim, humbedooh
 
   
-  * mod_ldap: add TRACE5 for LDAP retries
-    trunk patch: http://svn.apache.org/r1510085
-    2.4.x patch: trunk works
-    +1: covener, jim, humbedooh
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 307b926d91..13c35d3091 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -944,6 +944,7 @@ start_over:
                       "failed with server down";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
     if (result == LDAP_TIMEOUT && failures == 0) {
@@ -955,6 +956,7 @@ start_over:
                       "failed with timeout";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
     if (result != LDAP_SUCCESS) {
@@ -1099,6 +1101,7 @@ start_over:
         ldc->reason = "ldap_compare_s() failed with server down";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
     if (result == LDAP_TIMEOUT && failures == 0) {
@@ -1109,6 +1112,7 @@ start_over:
         ldc->reason = "ldap_compare_s() failed with timeout";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
 
@@ -1216,6 +1220,7 @@ start_over:
                       " down";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
     if (result == LDAP_TIMEOUT && failures == 0) {
@@ -1226,6 +1231,7 @@ start_over:
         ldc->reason = "ldap_search_ext_s() for subgroups failed with timeout";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
 
@@ -1694,6 +1700,7 @@ start_over:
         ldc->reason = "ldap_search_ext_s() for user failed with server down";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
 
@@ -1701,6 +1708,7 @@ start_over:
         ldc->reason = "ldap_search_ext_s() for user failed with timeout";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
 
@@ -1765,6 +1773,7 @@ start_over:
         ldap_msgfree(res);
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }
 
@@ -1960,6 +1969,7 @@ start_over:
         ldc->reason = "ldap_search_ext_s() for user failed with server down";
         uldap_connection_unbind(ldc);
         failures++;
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, r, "%s (attempt %d)", ldc->reason, failures);
         goto start_over;
     }