Changeset bac1a32 in mod_gnutls for src/gnutls_hooks.c


Ignore:
Timestamp:
Sep 30, 2018, 2:10:42 PM (2 years ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master, master, proxy-ticket
Children:
1a3068c
Parents:
fdd3bf0
Message:

Order, log message, and style fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_hooks.c

    rfdd3bf0 rbac1a32  
    603603        sc->singleton_wd = sc_base->singleton_wd;
    604604
    605         rv = mgs_load_files(pconf, ptemp, s);
    606         if (rv != 0) {
    607             ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
    608                 "GnuTLS: Loading required files failed."
    609                 " Shutting Down.");
    610             return HTTP_NOT_FOUND;
    611         }
    612 
    613605        /* defaults for unset values: */
    614606        if (sc->enabled == GNUTLS_ENABLED_UNSET)
     
    629621            sc->client_verify_method = mgs_cvm_cartel;
    630622
    631         // TODO: None of the stuff below (and neither some above)
    632         // makes sense if sc->enabled == GNUTLS_ENABLED_FALSE, we
    633         // should just continue to the next host. All code below could
    634         // then safely assume sc->enabled == GNUTLS_ENABLED_TRUE.
     623        // TODO: None of the stuff below needs to be done if
     624        // sc->enabled == GNUTLS_ENABLED_FALSE, we could just continue
     625        // to the next host.
     626
     627        /* Load certificates and stuff (includes parsing priority) */
     628        rv = mgs_load_files(pconf, ptemp, s);
     629        if (rv != 0) {
     630            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
     631                         "%s: Loading credentials failed!", __func__);
     632            return HTTP_NOT_FOUND;
     633        }
    635634
    636635        sc->ocsp_mutex = sc_base->ocsp_mutex;
Note: See TracChangeset for help on using the changeset viewer.