You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2014/07/20 00:05:11 UTC
svn commit: r1611980 - /httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
Author: jailletc36
Date: Sat Jul 19 22:05:10 2014
New Revision: 1611980
URL: http://svn.apache.org/r1611980
Log:
Add missing APLOGNO.
Split lines longer than 80.
Modified:
httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?rev=1611980&r1=1611979&r2=1611980&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Sat Jul 19 22:05:10 2014
@@ -429,7 +429,8 @@ static const char *ldap_determine_binddn
* 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_conne
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) ||