From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 15 Apr 2020 12:45:42 +0000 (+0000)
Subject: mod_{ssl,md}: init_stapling_status hooks should return an int.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1523
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a4acde30bc505dfcce44a63d04d7d9497a3d974;p=thirdparty%2Fapache%2Fhttpd.git

mod_{ssl,md}: init_stapling_status hooks should return an int.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876549 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/md/mod_md_ocsp.c b/modules/md/mod_md_ocsp.c
index fcc0a98160c..2891f331cc7 100644
--- a/modules/md/mod_md_ocsp.c
+++ b/modules/md/mod_md_ocsp.c
@@ -52,7 +52,7 @@ static int staple_here(md_srv_conf_t *sc)
             && md_config_geti(sc, MD_CONFIG_STAPLE_OTHERS));
 }
 
-apr_status_t md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
+int md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
                                           X509 *cert, X509 *issuer)
 {
     md_srv_conf_t *sc;
diff --git a/modules/md/mod_md_ocsp.h b/modules/md/mod_md_ocsp.h
index b0894caf115..9b36687434c 100644
--- a/modules/md/mod_md_ocsp.h
+++ b/modules/md/mod_md_ocsp.h
@@ -18,8 +18,8 @@
 #define mod_md_md_ocsp_h
 
 
-apr_status_t md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
-                                          X509 *cert, X509 *issuer);
+int md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
+                                 X509 *cert, X509 *issuer);
 
 apr_status_t md_ocsp_get_stapling_status(unsigned char **pder, int *pderlen, 
                                          conn_rec *c, server_rec *s, X509 *cert);
diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index a8e5d5d61b1..7ee43403718 100644
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -149,7 +149,7 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp,
         return 1;
     }
 
-    if (ssl_run_init_stapling_status(s, p, x, issuer) == APR_SUCCESS) {
+    if (ssl_run_init_stapling_status(s, p, x, issuer) == OK) {
         /* Someone's taken over or mod_ssl's own implementation is not enabled */
         if (mctx->stapling_enabled != TRUE) {
             SSL_CTX_set_tlsext_status_cb(mctx->ssl_ctx, stapling_cb);