Fixed compiling without OpenSSL.

diff --git a/configure.in b/configure.in
index 608e314a4697a72ec2aecdd01f0c71b0212e77bf..9c9021a8ea05524e6537bf16cd9e94f2e1015fe0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1704,6 +1704,7 @@ if test $want_openssl != no && test $have_ssl = no; then
     ],, $SSL_LIBS)
   fi
 fi
+AM_CONDITIONAL(BUILD_OPENSSL, test "$have_openssl" = "yes")
 
 if test $want_gnutls != no && test $have_ssl = no; then
   AC_CHECK_LIB(gnutls, gnutls_global_init, [

diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am
index fa506c92e56a88057c8d26a74e3465f3c30db889..5159b8e66dbc6992ca0b61d6facc1ab6dfcdfd89 100644 (file)
--- a/src/lib-ssl-iostream/Makefile.am
+++ b/src/lib-ssl-iostream/Makefile.am
@@ -4,13 +4,20 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test
 
-libssl_iostream_la_SOURCES = \
+if BUILD_OPENSSL
+ssl_sources = \
        iostream-openssl.c \
        iostream-openssl-context.c \
        iostream-openssl-params.c \
        istream-openssl.c \
        ostream-openssl.c
+else
+ssl_sources = \
+       iostream-ssl-none.c
+endif
 
+libssl_iostream_la_SOURCES = \
+       $(ssl_sources)
 libssl_iostream_la_LIBADD = \
        $(SSL_LIBS)
 

diff --git a/src/lib-ssl-iostream/iostream-ssl-none.c b/src/lib-ssl-iostream/iostream-ssl-none.c
new file mode 100644 (file)
index 0000000..b5eb6b4
--- /dev/null
+++ b/src/lib-ssl-iostream/iostream-ssl-none.c
@@ -0,0 +1,63 @@
+/* Copyright (c) 2011 Dovecot authors, see the included COPYING file */
+
+#include "lib.h"
+#include "iostream-ssl.h"
+
+int io_stream_create_ssl(struct ssl_iostream_context *ctx ATTR_UNUSED,
+                        const char *source ATTR_UNUSED,
+                        const struct ssl_iostream_settings *set ATTR_UNUSED,
+                        struct istream **input ATTR_UNUSED,
+                        struct ostream **output ATTR_UNUSED,
+                        struct ssl_iostream **iostream_r)
+{
+       *iostream_r = NULL;
+       return -1;
+}
+
+void ssl_iostream_unref(struct ssl_iostream **ssl_io ATTR_UNUSED)
+{
+}
+
+int ssl_iostream_handshake(struct ssl_iostream *ssl_io ATTR_UNUSED)
+{
+       return -1;
+}
+void ssl_iostream_set_handshake_callback(struct ssl_iostream *ssl_io ATTR_UNUSED,
+                                        int (*callback)(void *context) ATTR_UNUSED,
+                                        void *context ATTR_UNUSED) {}
+
+bool ssl_iostream_is_handshaked(const struct ssl_iostream *ssl_io ATTR_UNUSED) { return FALSE; }
+bool ssl_iostream_has_valid_client_cert(const struct ssl_iostream *ssl_io ATTR_UNUSED) { return FALSE; }
+bool ssl_iostream_has_broken_client_cert(struct ssl_iostream *ssl_io ATTR_UNUSED) { return TRUE; }
+const char *ssl_iostream_get_peer_name(struct ssl_iostream *ssl_io ATTR_UNUSED) { return NULL; }
+const char *ssl_iostream_get_security_string(struct ssl_iostream *ssl_io ATTR_UNUSED) { return NULL; }
+const char *ssl_iostream_get_last_error(struct ssl_iostream *ssl_io ATTR_UNUSED) { return NULL; }
+
+int ssl_iostream_generate_params(buffer_t *output ATTR_UNUSED)
+{
+       return -1;
+}
+int ssl_iostream_context_import_params(struct ssl_iostream_context *ctx ATTR_UNUSED,
+                                      const buffer_t *input ATTR_UNUSED)
+{
+       return -1;
+}
+
+int ssl_iostream_context_init_client(const char *source ATTR_UNUSED,
+                                    const struct ssl_iostream_settings *set ATTR_UNUSED,
+                                    struct ssl_iostream_context **ctx_r ATTR_UNUSED)
+{
+       return -1;
+}
+
+int ssl_iostream_context_init_server(const char *source ATTR_UNUSED,
+                                    const struct ssl_iostream_settings *set ATTR_UNUSED,
+                                    struct ssl_iostream_context **ctx_r)
+{
+       *ctx_r = NULL;
+       return -1;
+}
+
+void ssl_iostream_context_deinit(struct ssl_iostream_context **ctx ATTR_UNUSED)
+{
+}