Commit 175b499b authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1826686 from trunk: 

Instrument 'md_log_perror' and fix corresponding errors reported by gcc.


Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, covener


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

modules/md/md_acme.c

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ apr_status_t md_acme_create(md_acme_t **pacme, apr_pool_t *p, const char *url, 
    }

    

    if (APR_SUCCESS != (rv = md_util_abs_uri_check(p, url, &err))) {

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "invalid ACME uri ($s): %s", err, url);

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "invalid ACME uri (%s): %s", err, url);

        return rv;

    }
@@ -119,7 +119,7 @@ apr_status_t md_acme_create(md_acme_t **pacme, apr_pool_t *p, const char *url, 
    acme->max_retries = 3;

    

    if (APR_SUCCESS != (rv = apr_uri_parse(p, url, &uri_parsed))) {

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "parsing ACME uri: ", url);

        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "parsing ACME uri: %s", url);

        return APR_EINVAL;

    }
@@ -250,7 +250,7 @@ apr_status_t md_acme_req_body_init(md_acme_req_t *req, md_json_t *jpayload) 


    payload_len = strlen(payload);

    md_log_perror(MD_LOG_MARK, MD_LOG_TRACE1, 0, req->p, 

                  "acct payload(len=%d): %s", payload_len, payload);

                  "acct payload(len=%" APR_SIZE_T_FMT "): %s", payload_len, payload);

    return md_jws_sign(&req->req_json, req->p, payload, payload_len,

                       req->prot_hdrs, req->acme->acct_key, NULL);

}

modules/md/md_acme_acct.c

+2 −2
Original line number Diff line number Diff line
@@ -644,13 +644,13 @@ apr_status_t md_acme_check_agreement(md_acme_t *acme, apr_pool_t *p, 
        if (!tos) {

            if (APR_SUCCESS != (rv = md_acme_validate_acct(acme))) {

                md_log_perror(MD_LOG_MARK, MD_LOG_DEBUG, rv, acme->p, 

                              "validate for account %", acme->acct->id); 

                              "validate for account %s", acme->acct->id); 

                return rv;

            }

            tos = acme->acct->tos_required; 

            if (!tos) {

                md_log_perror(MD_LOG_MARK, MD_LOG_DEBUG, rv, acme->p, "unknown terms-of-service "

                              "required after validation of account %", acme->acct->id); 

                              "required after validation of account %s", acme->acct->id); 

                return APR_EGENERAL;

            }

        }

modules/md/md_log.h

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ const char *md_log_level_name(md_log_level_t level); 
int md_log_is_level(apr_pool_t *p, md_log_level_t level);



void md_log_perror(const char *file, int line, md_log_level_t level, 

                   apr_status_t rv, apr_pool_t *p, const char *fmt, ...);



                   apr_status_t rv, apr_pool_t *p, const char *fmt, ...)

                                __attribute__((format(printf,6,7)));



typedef int md_log_level_cb(void *baton, apr_pool_t *p, md_log_level_t level);

modules/md/md_store_fs.c

+3 −3
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static apr_status_t read_store_file(md_store_fs_t *s_fs, const char *fname, 
            store_version = 1.0;

        }

        if (store_version > MD_STORE_VERSION) {

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "version too new: %s", store_version);

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "version too new: %f", store_version);

            return APR_EINVAL;

        }
@@ -218,7 +218,7 @@ static apr_status_t read_store_file(md_store_fs_t *s_fs, const char *fname, 
        s_fs->key_len = md_util_base64url_decode(&key, key64, p);

        s_fs->key = (const unsigned char*)key;

        if (s_fs->key_len != FS_STORE_KLEN) {

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "key length unexpected: %d", 

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "key length unexpected: %" APR_SIZE_T_FMT, 

                          s_fs->key_len);

            return APR_EINVAL;

        }
@@ -849,7 +849,7 @@ static apr_status_t pfs_move(void *baton, apr_pool_t *p, apr_pool_t *ptemp, va_l 
                goto out;

        }

        if (!MD_OK(apr_file_rename(from_dir, to_dir, ptemp))) {

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, ptemp, "moving %s to %s: %s", 

            md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, ptemp, "rename from %s to %s", 

                          from_dir, to_dir);

            apr_file_rename(narch_dir, to_dir, ptemp);

            goto out;