BUILD: fix build error without SSL (ssl_cert)

One last-minute optimization broke the build without SSL support.
Move ssl_cert out of the #ifdef/#endif and it's OK.

diff --git a/include/types/protocols.h b/include/types/protocols.h
index 4e40a67266df4a5f52cad47ea81ac84948b1ce19..b075ef6a83270e024ea3bec27849bcf7c784afb1 100644 (file)
--- a/include/types/protocols.h
+++ b/include/types/protocols.h
@@ -130,8 +130,8 @@ struct listener {
        char *interface;                /* interface name or NULL */
        int maxseg;                     /* for TCP, advertised MSS */
 
-#ifdef USE_OPENSSL
        char *ssl_cert;                 /* ssl certificate */
+#ifdef USE_OPENSSL
        struct {
                SSL_CTX *ctx;
                char *ciphers;          /* cipher suite to use if non-null */

diff --git a/src/haproxy.c b/src/haproxy.c
index adf2614f37b4b10ee94f9c3d03fcbf4152187f05..4e75080306b46b652599d95af5b3b94d5fd02ad2 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -996,9 +996,7 @@ void deinit(void)
                        l_next = l->next;
                        unbind_listener(l);
                        delete_listener(l);
-#ifdef USE_OPENSSL
                        free(l->ssl_cert);
-#endif
                        free(l->name);
                        free(l->counters);
                        free(l);