Fixed two places, where sendto_realops_flags was mistakenly used, and removed this...

[irc/rqf/shadowircd.git] / modules / core / m_server.c

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 123e535b22a80ce9e83cc602ca1d31faad97a564..dfcf18e566b38c92509f3bfbfbe4cf741bfd3ac4 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -25,17 +25,15 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"            /* client struct */
 #include "common.h"            /* TRUE bleah */
-#include "event.h"
 #include "hash.h"              /* add_to_client_hash */
 #include "irc_string.h"
 #include "ircd.h"              /* me */
 #include "numeric.h"           /* ERR_xxx */
 #include "s_conf.h"            /* struct ConfItem */
 #include "s_newconf.h"
-#include "s_log.h"             /* log level defines */
+#include "logger.h"            /* log level defines */
 #include "s_serv.h"            /* server_estab, check_server */
 #include "s_stats.h"           /* ServerStats */
 #include "scache.h"
@@ -175,6 +173,15 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
                /* NOT REACHED */
                break;
+       case -5:
+               sendto_realops_snomask(SNO_GENERAL, L_ALL,\r
+                    "Connection from servername %s requires SSL/TLS but is plaintext",\r
+                    name);\r
+               ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s", \r
+                    log_client_name(client_p, SHOW_IP));\r
+\r
+               exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");\r
+               return 0;
        }
 
        if((target_p = find_server(NULL, name)))
@@ -422,10 +429,10 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
        SetServer(target_p);
 
-       dlinkAddTail(target_p, &target_p->node, &global_client_list);
-       dlinkAddTailAlloc(target_p, &global_serv_list);
+       rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+       rb_dlinkAddTailAlloc(target_p, &global_serv_list);
        add_to_client_hash(target_p->name, target_p);
-       dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+       rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
 
        target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
 
@@ -570,11 +577,11 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        target_p->servptr = source_p;
        SetServer(target_p);
 
-       dlinkAddTail(target_p, &target_p->node, &global_client_list);
-       dlinkAddTailAlloc(target_p, &global_serv_list);
+       rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+       rb_dlinkAddTailAlloc(target_p, &global_serv_list);
        add_to_client_hash(target_p->name, target_p);
        add_to_id_hash(target_p->id, target_p);
-       dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+       rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
 
        target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));