Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 31 Jul 2001 01:46:35 -0000
Message-ID: <20010731014635.58381.qmail@icarus.apache.org>
From: wrowe@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/ssl ssl_engine_pphrase.c

wrowe       01/07/30 18:46:34

  Modified:    modules/ssl ssl_engine_pphrase.c
  Log:
    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.
  
  Revision  Changes    Path
  1.7       +1 -9      httpd-2.0/modules/ssl/ssl_engine_pphrase.c
  
  Index: ssl_engine_pphrase.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ssl_engine_pphrase.c	2001/07/30 22:34:21	1.6
  +++ ssl_engine_pphrase.c	2001/07/31 01:46:34	1.7
  @@ -207,14 +207,6 @@
               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 @@
   
               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();
               }