diff options
| author | Doug MacEachern <dougm@apache.org> | 2002-03-28 01:34:13 +0100 |
|---|---|---|
| committer | Doug MacEachern <dougm@apache.org> | 2002-03-28 01:34:13 +0100 |
| commit | 249519625cd5c3c387f612aa07ffbddcbbb18e72 (patch) | |
| tree | 3373a1059b7b1d7077b95e4b736dd3ea295bccf5 /modules/ssl/ssl_engine_pphrase.c | |
| parent | break out certificate revocation list initialization into (diff) | |
| download | apache2-249519625cd5c3c387f612aa07ffbddcbbb18e72.tar.xz apache2-249519625cd5c3c387f612aa07ffbddcbbb18e72.zip | |
there is a heaping pile of:
ssl_log(s, flags, "Init: (%s) ...", sc->szVHostID)
add SSL_INIT flag to cut down some noise and end up with:
ssl_log(s, flags, "...")
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94247 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/ssl_engine_pphrase.c')
| -rw-r--r-- | modules/ssl/ssl_engine_pphrase.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c index a1c91250aa..15bb02581d 100644 --- a/modules/ssl/ssl_engine_pphrase.c +++ b/modules/ssl/ssl_engine_pphrase.c @@ -206,18 +206,17 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) continue; cpVHostID = ssl_util_vhostid(p, pServ); - ssl_log(pServ, SSL_LOG_INFO, - "Init: Loading certificate & private key of SSL-aware server %s", - cpVHostID); + ssl_log(pServ, SSL_LOG_INFO|SSL_INIT, + "Loading certificate & private key of SSL-aware server"); /* * Read in server certificate(s): This is the easy part * because this file isn't encrypted in any way. */ if (sc->szPublicCertFiles[0] == NULL) { - ssl_log(pServ, SSL_LOG_ERROR, - "Init: Server %s should be SSL-aware but has no certificate configured " - "[Hint: SSLCertificateFile]", cpVHostID); + ssl_log(pServ, SSL_LOG_ERROR|SSL_INIT, + "Server should be SSL-aware but has no certificate configured " + "[Hint: SSLCertificateFile]"); ssl_die(); } algoCert = SSL_ALGO_UNKNOWN; @@ -470,20 +469,20 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) * Log the type of reading */ if (nPassPhraseDialogCur == 0) { - ssl_log(pServ, SSL_LOG_TRACE, - "Init: (%s) unencrypted %s private key - pass phrase not required", - cpVHostID, an); + ssl_log(pServ, SSL_LOG_TRACE|SSL_INIT, + "unencrypted %s private key - pass phrase not required", + an); } else { if (cpPassPhraseCur != NULL) { - ssl_log(pServ, SSL_LOG_TRACE, - "Init: (%s) encrypted %s private key - pass phrase requested", - cpVHostID, an); + ssl_log(pServ, SSL_LOG_TRACE|SSL_INIT, + "encrypted %s private key - pass phrase requested", + an); } else { - ssl_log(pServ, SSL_LOG_TRACE, - "Init: (%s) encrypted %s private key - pass phrase reused", - cpVHostID, an); + ssl_log(pServ, SSL_LOG_TRACE|SSL_INIT, + "encrypted %s private key - pass phrase reused", + an); } } |