ircd: do not shadow internal openssl symbol "ssl_ok" (yeah, i know)

diff --git a/include/ircd.h b/include/ircd.h
index 48e901eb8d4cf2dff98b1ca0493983404e02e691..96ee6bc60988e26ef375dde01e5f78e998582141 100644 (file)
--- a/include/ircd.h
+++ b/include/ircd.h
@@ -99,8 +99,8 @@ extern int testing_conf;
 
 extern struct ev_entry *check_splitmode_ev;
 
-extern bool ssl_ok;
-extern bool zlib_ok;
+extern bool ircd_ssl_ok;
+extern bool ircd_zlib_ok;
 extern int maxconnections;
 
 void ircd_shutdown(const char *reason);

diff --git a/ircd/ircd.c b/ircd/ircd.c
index bf9e149db81e2a4161a4d6fdfdd7f973a57856f1..a1ee914a281176ce9d87c24b9004fa0c61409051 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -105,8 +105,8 @@ bool doremotd = false;
 bool kline_queued = false;
 bool server_state_foreground = false;
 bool opers_see_all_users = false;
-bool ssl_ok = false;
-bool zlib_ok = true;
+bool ircd_ssl_ok = false;
+bool ircd_zlib_ok = true;
 
 int testing_conf = 0;
 time_t startup_time;
@@ -721,10 +721,10 @@ charybdis_main(int argc, char *argv[])
                if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list))
                {
                        ilog(L_MAIN, "WARNING: Unable to setup SSL.");
-                       ssl_ok = false;
+                       ircd_ssl_ok = false;
                }
                else
-                       ssl_ok = true;
+                       ircd_ssl_ok = true;
        }
 
        if (testing_conf)

diff --git a/ircd/listener.c b/ircd/listener.c
index b191333f8d4c7e153acdf0ec331a2ac0f08642be..9fa0ca1bc89db201522e5f87e5c87470818c4157 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -523,7 +523,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
        static time_t last_oper_notice = 0;
        int len;
 
-       if(listener->ssl && (!ssl_ok || !get_ssld_count()))
+       if(listener->ssl && (!ircd_ssl_ok || !get_ssld_count()))
        {
                rb_close(F);
                return 0;

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index aaa9f86781b424475aa453917737ca03781eea34..18d628bd7441de22024ad0e19a039852f5438e76 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -868,9 +868,9 @@ validate_conf(void)
        if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list))
        {
                ilog(L_MAIN, "WARNING: Unable to setup SSL.");
-               ssl_ok = false;
+               ircd_ssl_ok = false;
        } else {
-               ssl_ok = true;
+               ircd_ssl_ok = true;
                send_new_ssl_certs(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params, ServerInfo.ssl_cipher_list);
        }
 

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index a479999e9a86f50e1dde5125ab03b89ae9f91a75..208a6fe16ef0c7366ac95bad017f235153c926ce 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -273,7 +273,7 @@ try_connections(void *unused)
                        continue;
 
                /* don't allow ssl connections if ssl isn't setup */
-               if(ServerConfSSL(tmp_p) && (!ssl_ok || !get_ssld_count()))
+               if(ServerConfSSL(tmp_p) && (!ircd_ssl_ok || !get_ssld_count()))
                        continue;
 
                cltmp = tmp_p->class;

diff --git a/ircd/sslproc.c b/ircd/sslproc.c
index 8b8804bd983051f4c47438eb8998f65bb0a9fbae..c66253147e508839f055a56d8ff1ff8781ec2445 100644 (file)
--- a/ircd/sslproc.c
+++ b/ircd/sslproc.c
@@ -339,7 +339,7 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
                rb_close(F2);
                rb_close(P1);
                ctl = allocate_ssl_daemon(F1, P2, pid);
-               if(ssl_ok)
+               if(ircd_ssl_ok)
                {
                        send_init_prng(ctl, RB_PRNG_DEFAULT, NULL);
                        send_certfp_method(ctl, ConfigFileEntry.certfp_method);
@@ -489,7 +489,7 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
                switch (*ctl_buf->buf)
                {
                case 'N':
-                       ssl_ok = false; /* ssld says it can't do ssl/tls */
+                       ircd_ssl_ok = false;    /* ssld says it can't do ssl/tls */
                        break;
                case 'D':
                        ssl_process_dead_fd(ctl, ctl_buf);
@@ -504,13 +504,13 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
                        ssl_process_zipstats(ctl, ctl_buf);
                        break;
                case 'I':
-                       ssl_ok = false;
+                       ircd_ssl_ok = false;
                        ilog(L_MAIN, "%s", cannot_setup_ssl);
                        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
                        break;
                case 'U':
                        zlib_ok = 0;
-                       ssl_ok = false;
+                       ircd_ssl_ok = false;
                        ilog(L_MAIN, "%s", no_ssl_or_zlib);
                        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
                        ssl_killall();
@@ -722,7 +722,7 @@ send_new_ssl_certs(const char *ssl_cert, const char *ssl_private_key, const char
        rb_dlink_node *ptr;
        if(ssl_cert == NULL || ssl_private_key == NULL || ssl_dh_params == NULL)
        {
-               ssl_ok = false;
+               ircd_ssl_ok = false;
                return;
        }
        RB_DLINK_FOREACH(ptr, ssl_daemons.head)

diff --git a/modules/m_connect.c b/modules/m_connect.c
index d3e4a5987b9541521842642b81980d4c39b2f772..3f1db4ddfc553e880894fd41c5d6992c411ee59d 100644 (file)
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -99,7 +99,7 @@ mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
                return;
        }
 
-       if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
+       if(ServerConfSSL(server_p) && (!ircd_ssl_ok || !get_ssld_count()))
        {
                sendto_one_notice(source_p,
                                  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
@@ -192,7 +192,7 @@ ms_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
                return;
        }
 
-       if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
+       if(ServerConfSSL(server_p) && (!ircd_ssl_ok || !get_ssld_count()))
        {
                sendto_one_notice(source_p,
                                  ":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",

diff --git a/modules/m_starttls.c b/modules/m_starttls.c
index fba20e7da58ec19c3bfd36ac77ff6d4a53aded42..67f31d15428e63286e2f1b2056aa8733476e8290 100644 (file)
--- a/modules/m_starttls.c
+++ b/modules/m_starttls.c
@@ -75,7 +75,7 @@ mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                return;
        }
 
-       if (!ssl_ok || !get_ssld_count())
+       if (!ircd_ssl_ok || !get_ssld_count())
        {
                sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
                return;