Commit 5ea201a3 authored by Paul J. Reder's avatar Paul J. Reder
Browse files

Commit approved revision 732912 backport of PR 46342 

  *) mod_authnz_ldap: Reduce number of initialization debug messages and make
     information more clear. PR 46342 [Dan Poirier]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@734895 13f79535-47bb-0310-9956-ffa450edef68
parent 86cfa789

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.12



  *) mod_authnz_ldap: Reduce number of initialization debug messages and make

     information more clear. PR 46342 [Dan Poirier]



  *) mod_cache: Introduce 'no-cache' per-request environment variable

     to prevent the saving of an otherwise cacheable response.

     [Eric Covener]

STATUS

+0 −8
Original line number Diff line number Diff line
@@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



 * mod_authnz_ldap: Reduce number of initialization debug messages and make

   information more clear. PR 46342

    Trunk version of path:

      http://svn.apache.org/viewvc?view=rev&revision=732912

    Backport version for 2.2.x (trunk applies with fudge):

      http://people.apache.org/~rederpj/backport_PR46342_simpleLDAPinit.diff

    +1: rederpj, niq, covener





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/aaa/mod_authnz_ldap.c

+15 −23
Original line number Diff line number Diff line
@@ -872,31 +872,12 @@ static const char *mod_auth_ldap_parse_url(cmd_parms *cmd, 


    authn_ldap_config_t *sec = config;



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: `%s'", getpid(), url);



    rc = apr_ldap_url_parse(cmd->pool, url, &(urld), &(result));

    if (rc != APR_SUCCESS) {

        return result->reason;

    }

    sec->url = apr_pstrdup(cmd->pool, url);



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: Host: %s", getpid(), urld->lud_host);

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: Port: %d", getpid(), urld->lud_port);

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: DN: %s", getpid(), urld->lud_dn);

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: attrib: %s", getpid(), urld->lud_attrs? urld->lud_attrs[0] : "(null)");

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: scope: %s", getpid(),

                 (urld->lud_scope == LDAP_SCOPE_SUBTREE? "subtree" :

                  urld->lud_scope == LDAP_SCOPE_BASE? "base" :

                  urld->lud_scope == LDAP_SCOPE_ONELEVEL? "onelevel" : "unknown"));

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: filter: %s", getpid(), urld->lud_filter);



    /* Set all the values, or at least some sane defaults */

    if (sec->host) {

        char *p = apr_palloc(cmd->pool, strlen(sec->host) + strlen(urld->lud_host) + 2);
@@ -968,18 +949,29 @@ static const char *mod_auth_ldap_parse_url(cmd_parms *cmd, 
    {

        sec->secure = APR_LDAP_SSL;

        sec->port = urld->lud_port? urld->lud_port : LDAPS_PORT;

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,

                     "LDAP: auth_ldap using SSL connections");

    }

    else

    {

        sec->port = urld->lud_port? urld->lud_port : LDAP_PORT;

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,

                     "LDAP: auth_ldap not using SSL connections");

    }



    sec->have_ldap_url = 1;



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

                 cmd->server, "[%" APR_PID_T_FMT "] auth_ldap url parse: `%s', Host: %s, Port: %d, DN: %s, attrib: %s, scope: %s, filter: %s, connection mode: %s",

                 getpid(),

                 url,

                 urld->lud_host,

                 urld->lud_port,

                 urld->lud_dn,

                 urld->lud_attrs? urld->lud_attrs[0] : "(null)",

                 (urld->lud_scope == LDAP_SCOPE_SUBTREE? "subtree" :

                  urld->lud_scope == LDAP_SCOPE_BASE? "base" :

                  urld->lud_scope == LDAP_SCOPE_ONELEVEL? "onelevel" : "unknown"),

                 urld->lud_filter,

                 sec->secure == APR_LDAP_SSL  ? "using SSL": "not using SSL"

                 );



    return NULL;

}