From: Doug MacEachern <dougm@apache.org>
Date: Thu, 28 Mar 2002 01:14:53 +0000 (+0000)
Subject: move server specific init config checks into ssl_init_check_server
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cf8225f39de621b67adf8f2ac01173fe50fceb1;p=apache

move server specific init config checks into ssl_init_check_server
function (ssl_init_check_proxy will be different)


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

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index c14eae2d55..38cfa1df95 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -365,6 +365,34 @@ void ssl_init_Engine(server_rec *s, apr_pool_t *p)
 }
 #endif
 
+static void ssl_init_check_server(server_rec *s,
+                                  apr_pool_t *p,
+                                  apr_pool_t *ptemp,
+                                  SSLSrvConfigRec *sc)
+{
+    /*
+     * check for important parameters and the
+     * possibility that the user forgot to set them.
+     */
+    if (!sc->szPublicCertFiles[0]) {
+        ssl_log(s, SSL_LOG_ERROR|SSL_INIT,
+                "No SSL Certificate set [hint: SSLCertificateFile]");
+        ssl_die();
+    }
+
+    /*
+     *  Check for problematic re-initializations
+     */
+    if (sc->pPublicCert[SSL_AIDX_RSA] ||
+        sc->pPublicCert[SSL_AIDX_DSA])
+    {
+        ssl_log(s, SSL_LOG_ERROR|SSL_INIT,
+                "Illegal attempt to re-initialise SSL for server "
+                "(theoretically shouldn't happen!)");
+        ssl_die();
+    }
+}
+
 static SSL_CTX *ssl_init_ctx(server_rec *s,
                              apr_pool_t *p,
                              apr_pool_t *ptemp,
@@ -652,27 +680,7 @@ void ssl_init_ConfigureServer(server_rec *s,
     int is_ca, pathlen;
     int i;
 
-    /*
-     * Now check for important parameters and the
-     * possibility that the user forgot to set them.
-     */
-    if (!sc->szPublicCertFiles[0]) {
-        ssl_log(s, SSL_LOG_ERROR|SSL_INIT,
-                "No SSL Certificate set [hint: SSLCertificateFile]");
-        ssl_die();
-    }
-
-    /*
-     *  Check for problematic re-initializations
-     */
-    if (sc->pPublicCert[SSL_AIDX_RSA] ||
-        sc->pPublicCert[SSL_AIDX_DSA])
-    {
-        ssl_log(s, SSL_LOG_ERROR|SSL_INIT,
-                "Illegal attempt to re-initialise SSL for server "
-                "(theoretically shouldn't happen!)");
-        ssl_die();
-    }
+    ssl_init_check_server(s, p, ptemp, sc);
 
     ctx = ssl_init_ctx(s, p, ptemp, sc);