From 4fb309fbded1c5eaf03e3e8a09e23276491affa3 Mon Sep 17 00:00:00 2001 From: stskeeps Date: Sun, 29 Oct 2000 16:08:20 +0000 Subject: [PATCH] -- Fixed a wierd channel message bug +- Fixed a wierd channel message bug || +- Fixed a bug where non-NS servers would crash when linking --- Changes | 3 ++- src/s_serv.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index d3e7fef8d..8d22592ac 100644 --- a/Changes +++ b/Changes @@ -668,4 +668,5 @@ - Fixed a linking bug (where did that come from) - Fixed bug where duplicate numerics could occur - Fixed the hashing bug (thank you ROXnet ...) -- Fixed a wierd channel message bug +- Fixed a wierd channel message bug || +- Fixed a bug where non-NS servers would crash when linking diff --git a/src/s_serv.c b/src/s_serv.c index 2219d480b..cd468d2bc 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -1198,8 +1198,12 @@ int m_server_estab(cptr) cptr->srvptr = &me; cptr->serv->nline = aconf; - if (numeric_collides(atoi(num))) + if (num && numeric_collides(atoi(num))) { + sendto_serv_butone(&me, + ":%s GLOBOPS :Cancelling link %s, colliding numeric", me.name, + inpath); + sendto_locfailops("Cancelling link %s, colliding numeric", inpath); return exit_client(cptr, cptr, cptr, "Colliding server numeric (choose another in the M:line)"); }