Mercurial > dovecot > original-hg > dovecot-1.2
changeset 2679:8f7b01c29bcb HEAD
Show clear error messages if --ssl is tried to be used but it's not
builtin/enabled.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 01 Oct 2004 17:41:16 +0300 |
| parents | f5726706dc56 |
| children | 48df7f95fa4a |
| files | src/login-common/main.c src/login-common/ssl-proxy-gnutls.c src/login-common/ssl-proxy-openssl.c src/login-common/ssl-proxy.c |
| diffstat | 4 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/login-common/main.c Fri Oct 01 16:46:01 2004 +0300 +++ b/src/login-common/main.c Fri Oct 01 17:41:16 2004 +0300 @@ -281,7 +281,7 @@ if (strcmp(argv[i], "--ssl") == 0) { fd = ssl_proxy_new(fd, &ip, &proxy); if (fd == -1) - i_fatal("SSL initialization failed"); + return 1; } else if (strncmp(argv[i], "--group=", 8) != 0) i_fatal("Unknown parameter: %s", argv[i]); }
--- a/src/login-common/ssl-proxy-gnutls.c Fri Oct 01 16:46:01 2004 +0300 +++ b/src/login-common/ssl-proxy-gnutls.c Fri Oct 01 17:41:16 2004 +0300 @@ -312,8 +312,10 @@ gnutls_session session; int sfd[2]; - if (!ssl_initialized) + if (!ssl_initialized) { + i_error("SSL support not enabled in configuration"); return -1; + } session = initialize_state(); gnutls_transport_set_ptr(session, fd);
--- a/src/login-common/ssl-proxy-openssl.c Fri Oct 01 16:46:01 2004 +0300 +++ b/src/login-common/ssl-proxy-openssl.c Fri Oct 01 17:41:16 2004 +0300 @@ -319,8 +319,10 @@ *proxy_r = NULL; - if (!ssl_initialized) + if (!ssl_initialized) { + i_error("SSL support not enabled in configuration"); return -1; + } ssl = SSL_new(ssl_ctx); if (ssl == NULL) {
--- a/src/login-common/ssl-proxy.c Fri Oct 01 16:46:01 2004 +0300 +++ b/src/login-common/ssl-proxy.c Fri Oct 01 17:41:16 2004 +0300 @@ -12,6 +12,7 @@ int ssl_proxy_new(int fd __attr_unused__, struct ip_addr *ip __attr_unused__, struct ssl_proxy **proxy_r __attr_unused__) { + i_error("Dovecot wasn't built with SSL support"); return -1; }