Commit c07bd712 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1725485 from trunk: 

Added many log numbers to log statements that
had none.

Those were not detected by the coccinelle script.

Submitted by: rjung
Reviewed/backported by: jim


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

STATUS

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

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



  *) various: APLOGNO

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

     2.4.x patch:  trunk works

                   http://home.apache.org/~jim/patches/aplogno-2.4.patch

     +1: jim, rjung, rpluem



  *) mod_heartmonitor: No need to search twice for the same value + fix some style

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

     2.4.x patch:  trunk works

modules/aaa/mod_authnz_ldap.c

+2 −2
Original line number Diff line number Diff line
@@ -1796,7 +1796,7 @@ static int authnz_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t * 
    {

        if (!util_ldap_ssl_supported(s))

        {

            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,

            ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, APLOGNO(03159)

                         "LDAP: SSL connections (ldaps://) not supported by utilLDAP");

            return(!OK);

        }

modules/arch/unix/mod_privileges.c

+19 −19
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
    apr_strerror(errno, msgbuf, sizeof(msgbuf)); \

    return apr_pstrdup(cmd->pool, msgbuf); \

}

#define CR_CHECK(x) if (x == -1) \

    ap_log_error(APLOG_MARK, APLOG_CRIT, errno, 0, \

#define CR_CHECK(x, y) if (x == -1) \

    ap_log_error(APLOG_MARK, APLOG_CRIT, errno, 0, y \

                 "Failed to initialise privileges")



module AP_MODULE_DECLARE_DATA privileges_module;
@@ -87,17 +87,17 @@ static void *privileges_create_cfg(apr_pool_t *pool, server_rec *s) 
    /* By default, run in secure vhost mode.

     * That means dropping basic privileges we don't usually need.

     */

    CR_CHECK(priv_delset(cfg->priv, PRIV_FILE_LINK_ANY));

    CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_INFO));

    CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_SESSION));

    CR_CHECK(priv_delset(cfg->priv, PRIV_FILE_LINK_ANY), APLOGNO(03160));

    CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_INFO), APLOGNO(03161));

    CR_CHECK(priv_delset(cfg->priv, PRIV_PROC_SESSION), APLOGNO(03162));



/* Hmmm, should CGI default to secure too ? */

/*

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_FILE_LINK_ANY));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_INFO));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_SESSION));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_FORK));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_EXEC));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_FILE_LINK_ANY), APLOGNO(03163));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_INFO), APLOGNO(03164));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_SESSION), APLOGNO(03165));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_FORK), APLOGNO(03166));

    CR_CHECK(priv_delset(cfg->child_priv, PRIV_PROC_EXEC), APLOGNO(03167));

*/



    /* we´ll use 0 for unset */
@@ -362,16 +362,16 @@ static int privileges_postconf(apr_pool_t *pconf, apr_pool_t *plog, 
    if (dtrace_enabled) {

        for (sp = s; sp != NULL; sp = sp->next) {

            cfg = ap_get_module_config(sp->module_config, &privileges_module);

            CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_KERNEL));

            CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_PROC));

            CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_USER));

            CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_KERNEL));

            CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_PROC));

            CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_USER));

        }

        CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_KERNEL));

        CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_PROC));

        CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_USER));

            CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_KERNEL), APLOGNO(03168));

            CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_PROC), APLOGNO(03169));

            CR_CHECK(priv_addset(cfg->priv, PRIV_DTRACE_USER), APLOGNO(03170));

            CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_KERNEL), APLOGNO(03171));

            CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_PROC), APLOGNO(03172));

            CR_CHECK(priv_addset(cfg->child_priv, PRIV_DTRACE_USER), APLOGNO(03173));

        }

        CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_KERNEL), APLOGNO(03174));

        CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_PROC), APLOGNO(03175));

        CR_CHECK(priv_addset(priv_default, PRIV_DTRACE_USER), APLOGNO(03176));

    }



    /* set up priv_setid for per-request use */

modules/arch/win32/mod_isapi.c

+6 −6
Original line number Diff line number Diff line
@@ -933,8 +933,8 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, 
            rv = ap_pass_brigade(cid->r->output_filters, bb);

            cid->response_sent = 1;

            if (rv != APR_SUCCESS)

                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

                              "ServerSupport function "

                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03177)

                              "ServerSupportFunction "

                              "HSE_REQ_SEND_RESPONSE_HEADER "

                              "ap_pass_brigade failed: %s", r->filename);

            return (rv == APR_SUCCESS);
@@ -1135,8 +1135,8 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, 
        rv = ap_pass_brigade(r->output_filters, bb);

        cid->response_sent = 1;

        if (rv != APR_SUCCESS)

            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

                          "ServerSupport function "

            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03178)

                          "ServerSupportFunction "

                          "HSE_REQ_TRANSMIT_FILE "

                          "ap_pass_brigade failed: %s", r->filename);
@@ -1348,8 +1348,8 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, 
            rv = ap_pass_brigade(cid->r->output_filters, bb);

            cid->response_sent = 1;

            if (rv != APR_SUCCESS)

                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,

                              "ServerSupport function "

                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03179)

                              "ServerSupportFunction "

                              "HSE_REQ_SEND_RESPONSE_HEADER_EX "

                              "ap_pass_brigade failed: %s", r->filename);

            return (rv == APR_SUCCESS);

modules/arch/win32/mod_win32.c

+2 −2
Original line number Diff line number Diff line
@@ -423,8 +423,8 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv, 
        }

        else {

            ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,

                 strict ? "No ExecCGI verb found for files of type '%s'."

                        : "No ExecCGI or Open verb found for files of type '%s'.",

                 strict ? APLOGNO(03180) "No ExecCGI verb found for files of type '%s'."

                        : APLOGNO(03181) "No ExecCGI or Open verb found for files of type '%s'.",

                 ext);

        }

    }