From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 19 Jul 2014 22:05:10 +0000 (+0000)
Subject: Add missing APLOGNO.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac5bbd393a086a7985bc44504d3aa390c72acd88;p=thirdparty%2Fapache%2Fhttpd.git

Add missing APLOGNO.
Split lines longer than 80.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1611980 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 17607d02be0..d0f223dc380 100644
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -429,7 +429,8 @@ static const char *ldap_determine_binddn(request_rec *r, const char *user) {
  * might be good for the DN lookup but not for later operations. 
  * Requires the per-request config be set to ensure the connection is cleaned up
  */
-static util_ldap_connection_t *get_connection_for_authz(request_rec *r, enum auth_ldap_optype type) {
+static util_ldap_connection_t *get_connection_for_authz(request_rec *r, enum auth_ldap_optype type)
+{
     authn_ldap_request_t *req =
         (authn_ldap_request_t *)ap_get_module_config(r->request_config, &authnz_ldap_module);
     authn_ldap_config_t *sec =
@@ -440,11 +441,14 @@ static util_ldap_connection_t *get_connection_for_authz(request_rec *r, enum aut
     char *bindpw = sec->bindpw;
 
     if (!req) { 
-        ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, "module error: get_connection_for_authz without per-request config");
+        ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(02659)
+                      "module error: get_connection_for_authz without "
+                      "per-request config");
         return NULL;
     }
 
-    /* If the password isn't set in the per-request config , we didn't authenticate this user, and leave the default credentials */
+    /* If the password isn't set in the per-request config, we didn't
+     * authenticate this user, and leave the default credentials */
     if (req->password &&
          ((type == LDAP_SEARCH && sec->search_as_user)    ||
           (type == LDAP_COMPARE && sec->compare_as_user)  ||