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

[solanum.git] / ircd / sslproc.c

diff --git a/ircd/sslproc.c b/ircd/sslproc.c
index 0ce5617b19d0ef843d2a818cb199480e68711cce..c66253147e508839f055a56d8ff1ff8781ec2445 100644 (file)
--- a/ircd/sslproc.c
+++ b/ircd/sslproc.c
@@ -17,11 +17,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  *  USA
- *
- *  $Id$
  */
 
-#include <ratbox_lib.h>
+#include <rb_lib.h>
 #include "stdinc.h"
 
 
@@ -341,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);
@@ -491,7 +489,7 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
                switch (*ctl_buf->buf)
                {
                case 'N':
-                       ssl_ok = 0;     /* 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);
@@ -506,17 +504,17 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
                        ssl_process_zipstats(ctl, ctl_buf);
                        break;
                case 'I':
-                       ssl_ok = 0;
+                       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 = 0;
+                       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();
-                       break;
+                       return;
                case 'V':
                        len = ctl_buf->buflen - 1;
                        if (len > sizeof(ctl->version) - 1)
@@ -724,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 = 0;
+               ircd_ssl_ok = false;
                return;
        }
        RB_DLINK_FOREACH(ptr, ssl_daemons.head)