From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 31 Jul 2001 01:46:34 +0000 (+0000)
Subject:   Thanks Madhu, I think backing out the last bit, and using this instead,
X-Git-Tag: 2.0.23~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7f3320db797b528bee7e2c6dd1259b51d763b0e;p=thirdparty%2Fapache%2Fhttpd.git

  Thanks Madhu, I think backing out the last bit, and using this instead,
  may be a bit simpler.  Could still exist a problem feel free to fix.


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

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index c4799dad736..e6960dbe85f 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -207,14 +207,6 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
             if (sc->szPrivateKeyFile[j] != NULL)
                 apr_cpystrn(szPath, sc->szPrivateKeyFile[j++], sizeof(szPath));
 
-            if (sc->szPrivateKeyFile[j] == NULL) {
-                ssl_log(pServ, SSL_LOG_ERROR,
-                        "Init: Server %s should be SSL-aware but "
-                        "too few private key files were specified "
-                        "[Hint: SSLCertificateKeyFile]", cpVHostID);
-                ssl_die();
-            }
-
             /*
              * Try to read the private key file with the help of
              * the callback function which serves the pass
@@ -320,7 +312,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
 
             if (pPrivateKey == NULL) {
                 ssl_log(s, SSL_LOG_ERROR|SSL_ADD_SSLERR,
-                        "Init: Unable to read server private key from file %s", szPath);
+                        "Init: Unable to read server private key from file %s perhaps it is in a seperate file? [Hint: SSLCertificateKeyFile]", szPath);
                 ssl_die();
             }