From aca979a473a316f414ce96645f007cd716c3abca Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 15 Jan 2015 20:11:14 +0000 Subject: [PATCH] [457371] Fix building for WITH_TLS=no Thanks to Micheal Laing. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=457371 --- lib/mosquitto_internal.h | 4 +++- lib/socks_mosq.c | 1 + src/read_handle_server.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h index 86015fa1..f4fcde8a 100644 --- a/lib/mosquitto_internal.h +++ b/lib/mosquitto_internal.h @@ -24,7 +24,9 @@ Contributors: #endif #ifdef WITH_TLS -#include +# include +#else +# include #endif #include diff --git a/lib/socks_mosq.c b/lib/socks_mosq.c index 9085fd2a..564f8d78 100644 --- a/lib/socks_mosq.c +++ b/lib/socks_mosq.c @@ -15,6 +15,7 @@ Contributors: */ #include +#include #include "mosquitto_internal.h" #include "memory_mosq.h" diff --git a/src/read_handle_server.c b/src/read_handle_server.c index 8a6da562..f349c762 100644 --- a/src/read_handle_server.c +++ b/src/read_handle_server.c @@ -93,8 +93,8 @@ int mqtt3_handle_connect(struct mosquitto_db *db, struct mosquitto *context) struct mosquitto *found_context; int slen; struct _mosquitto_subleaf *leaf; -#ifdef WITH_TLS int i; +#ifdef WITH_TLS X509 *client_cert = NULL; X509_NAME *name; X509_NAME_ENTRY *name_entry;