Commit 97d5c93a authored by Joe Orton's avatar Joe Orton
Browse files

Merge r1850834 from trunk: 

* modules/md/md_acme_drive.c (acme_driver_init):
  Remove written-but-not-read variable (gcc 8.x warning).

Submitted by: jorton
Reviewed by: jailletc36, jim, ylavic


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

modules/md/md_acme_drive.c

+0 −3
Original line number Diff line number Diff line
@@ -618,7 +618,6 @@ static apr_status_t acme_driver_init(md_proto_driver_t *d) 
{

    md_acme_driver_t *ad;

    apr_status_t rv = APR_SUCCESS;

    int challenges_configured = 0;



    ad = apr_pcalloc(d->p, sizeof(*ad));
@@ -635,12 +634,10 @@ static apr_status_t acme_driver_init(md_proto_driver_t *d) 
    if (d->challenge) {

        /* we have been told to use this type */

        APR_ARRAY_PUSH(ad->ca_challenges, const char*) = apr_pstrdup(d->p, d->challenge);

        challenges_configured = 1;

    }

    else if (d->md->ca_challenges && d->md->ca_challenges->nelts > 0) {

        /* pre-configured set for this managed domain */

        apr_array_cat(ad->ca_challenges, d->md->ca_challenges);

        challenges_configured = 1;

    }

    else {

        /* free to chose. Add all we support and see what we get offered */