From: Willy Tarreau <w@1wt.eu>
Date: Tue, 4 Sep 2012 13:13:20 +0000 (+0200)
Subject: BUILD: fix build error without SSL (ssl_cert)
X-Git-Tag: v1.5-dev12~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff9f7698fcefef66bceb1ec32a3da8b14947a594;p=thirdparty%2Fhaproxy.git

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 4e40a67266..b075ef6a83 100644
--- 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 adf2614f37..4e75080306 100644
--- 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);