Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 27DFB11884 for ; Sat, 19 Jul 2014 22:05:35 +0000 (UTC) Received: (qmail 16248 invoked by uid 500); 19 Jul 2014 22:05:35 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 16180 invoked by uid 500); 19 Jul 2014 22:05:34 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 16171 invoked by uid 99); 19 Jul 2014 22:05:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jul 2014 22:05:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jul 2014 22:05:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3646123889F1; Sat, 19 Jul 2014 22:05:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1611980 - /httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Date: Sat, 19 Jul 2014 22:05:11 -0000 To: cvs@httpd.apache.org From: jailletc36@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140719220511.3646123889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) ||