diff options
author | Nokis Mavrogiannopoulos | 2008-10-01 16:06:35 +0000 |
---|---|---|
committer | Nokis Mavrogiannopoulos | 2008-10-01 16:06:35 +0000 |
commit | 1ff352c814a81b19b6348b96845f425d2711fc57 (patch) | |
tree | 091d0595f162976373f55a325d16d4719a73c1ae /src/gnutls_hooks.c | |
parent | d9d142a15aba29f9e28028f7f9a092bd6f667cc9 (diff) |
Allow openpgp-only sites
Diffstat (limited to 'src/gnutls_hooks.c')
-rw-r--r-- | src/gnutls_hooks.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c index 57d3aaf..57bfeba 100644 --- a/src/gnutls_hooks.c +++ b/src/gnutls_hooks.c | |||
@@ -409,8 +409,9 @@ mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog, | |||
409 | } | 409 | } |
410 | #endif | 410 | #endif |
411 | 411 | ||
412 | if (sc->certs_x509[0] == NULL | 412 | if (sc->certs_x509[0] == NULL && |
413 | && sc->enabled == GNUTLS_ENABLED_TRUE) { | 413 | sc->cert_pgp == NULL && |
414 | sc->enabled == GNUTLS_ENABLED_TRUE) { | ||
414 | ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, | 415 | ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, |
415 | "[GnuTLS] - Host '%s:%d' is missing a " | 416 | "[GnuTLS] - Host '%s:%d' is missing a " |
416 | "Certificate File!", s->server_hostname, | 417 | "Certificate File!", s->server_hostname, |
@@ -418,8 +419,9 @@ mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog, | |||
418 | exit(-1); | 419 | exit(-1); |
419 | } | 420 | } |
420 | 421 | ||
421 | if (sc->privkey_x509 == NULL | 422 | if (sc->enabled == GNUTLS_ENABLED_TRUE && |
422 | && sc->enabled == GNUTLS_ENABLED_TRUE) { | 423 | ((sc->certs_x509[0] != NULL && sc->privkey_x509 == NULL) || |
424 | (sc->cert_pgp != NULL && sc->privkey_pgp == NULL))) { | ||
423 | ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, | 425 | ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, |
424 | "[GnuTLS] - Host '%s:%d' is missing a " | 426 | "[GnuTLS] - Host '%s:%d' is missing a " |
425 | "Private Key File!", | 427 | "Private Key File!", |