Do not install ban .conf files (like kline.conf, rsv.conf, etc) as they aren't used...

[irc/rqf/shadowircd.git] / modules / m_svinfo.c

diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c
index 6f7f3267703aa11cb068d5ae64f755507dd40d72..99047f595826f9450941aaa430c304027080de73 100644 (file)
--- a/modules/m_svinfo.c
+++ b/modules/m_svinfo.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_svinfo.c 494 2006-01-15 16:08:28Z jilles $
  */
 #include "stdinc.h"
 #include "client.h"
@@ -31,6 +30,7 @@
 #include "numeric.h"
 #include "send.h"
 #include "s_conf.h"
+#include "s_newconf.h"
 #include "logger.h"
 #include "msg.h"
 #include "parse.h"
@@ -48,7 +48,6 @@ DECLARE_MODULE_AV1(svinfo, NULL, NULL, svinfo_clist, NULL, NULL, "$Revision: 494
 
 /*
  * ms_svinfo - SVINFO message handler
- *      parv[0] = sender prefix
  *      parv[1] = TS_CURRENT for the server
  *      parv[2] = TS_MIN for the server
  *      parv[3] = unused, send 0
@@ -70,8 +69,8 @@ ms_svinfo(struct Client *client_p, struct Client *source_p, int parc, const char
                /* TS version is too low on one of the sides, drop the link */
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s dropped, wrong TS protocol version (%s,%s)",
-                                    get_server_name(source_p, SHOW_IP), parv[1], parv[2]);
-               snprintf(squitreason, sizeof squitreason, "Incompatible TS version (%s,%s)",
+                                    source_p->name, parv[1], parv[2]);
+               rb_snprintf(squitreason, sizeof squitreason, "Incompatible TS version (%s,%s)",
                                parv[1], parv[2]);
                exit_client(source_p, source_p, source_p, squitreason);
                return 0;
@@ -89,14 +88,15 @@ ms_svinfo(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s dropped, excessive TS delta"
                                     " (my TS=%ld, their TS=%ld, delta=%d)",
-                                    get_server_name(source_p, SHOW_IP),
+                                    source_p->name,
                                     (long) rb_current_time(), (long) theirtime, deltat);
                ilog(L_SERVER,
                     "Link %s dropped, excessive TS delta"
                     " (my TS=%ld, their TS=%ld, delta=%d)",
                     log_client_name(source_p, SHOW_IP), (long) rb_current_time(), (long) theirtime, deltat);
-               snprintf(squitreason, sizeof squitreason, "Excessive TS delta (my TS=%ld, their TS=%ld, delta=%d)",
+               rb_snprintf(squitreason, sizeof squitreason, "Excessive TS delta (my TS=%ld, their TS=%ld, delta=%d)",
                                (long) rb_current_time(), (long) theirtime, deltat);
+               disable_server_conf_autoconn(source_p->name);
                exit_client(source_p, source_p, source_p, squitreason);
                return 0;
        }