summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/protocol/bahamut.c5
-rw-r--r--src/protocol/charybdis.c3
-rw-r--r--src/protocol/dreamforge.c3
-rw-r--r--src/protocol/hybrid.c3
-rw-r--r--src/protocol/inspircd10.c3
-rw-r--r--src/protocol/inspircd11.c3
-rw-r--r--src/protocol/plexus2.c3
-rw-r--r--src/protocol/plexus3.c3
-rw-r--r--src/protocol/ptlink.c3
-rw-r--r--src/protocol/rageircd.c3
-rw-r--r--src/protocol/ratbox.c3
-rw-r--r--src/protocol/shadowircd.c3
-rw-r--r--src/protocol/solidircd.c3
-rw-r--r--src/protocol/ultimate2.c3
-rw-r--r--src/protocol/ultimate3.c3
-rw-r--r--src/protocol/unreal31.c3
-rw-r--r--src/protocol/unreal32.c3
-rw-r--r--src/protocol/viagra.c3
-rw-r--r--src/servers.c8
19 files changed, 40 insertions, 24 deletions
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 9f0d352cc..11629d890 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -266,7 +266,7 @@ unsigned long umodes[128] = {
UMODE_y, /* y */
0, /* z */
0, 0, 0, /* { | } */
- 0, 0 /* ~ ‚ */
+ 0, 0 /* ~ � */
};
char myCsmodes[128] = {
@@ -1504,7 +1504,8 @@ void bahamut_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- bahamut_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ bahamut_cmd_squit(jserver, rbuf);
bahamut_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 37c6a47cd..c0b1a6177 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1818,7 +1818,8 @@ void charybdis_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- charybdis_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ charybdis_cmd_squit(jserver, rbuf);
charybdis_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/dreamforge.c b/src/protocol/dreamforge.c
index 926c73655..7c4ee039f 100644
--- a/src/protocol/dreamforge.c
+++ b/src/protocol/dreamforge.c
@@ -1215,7 +1215,8 @@ void dreamforge_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- dreamforge_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ dreamforge_cmd_squit(jserver, rbuf);
dreamforge_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index 4211925e5..7501177d2 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -1394,7 +1394,8 @@ void hybrid_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- hybrid_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ hybrid_cmd_squit(jserver, rbuf);
hybrid_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/inspircd10.c b/src/protocol/inspircd10.c
index c0c259169..1944922f5 100644
--- a/src/protocol/inspircd10.c
+++ b/src/protocol/inspircd10.c
@@ -1554,7 +1554,8 @@ void inspircd_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- inspircd_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ inspircd_cmd_squit(jserver, rbuf);
inspircd_cmd_server(jserver, 1, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 71278ab56..ca5fc944a 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1646,7 +1646,8 @@ void inspircd_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- inspircd_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ inspircd_cmd_squit(jserver, rbuf);
inspircd_cmd_server(jserver, 1, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/plexus2.c b/src/protocol/plexus2.c
index 33437c263..12130acdd 100644
--- a/src/protocol/plexus2.c
+++ b/src/protocol/plexus2.c
@@ -1707,7 +1707,8 @@ plexus_cmd_jupe (char *jserver, char *who, char *reason)
snprintf (rbuf, sizeof (rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- plexus_cmd_squit (jserver, rbuf);
+ if (findserver(servlist, jserver))
+ plexus_cmd_squit (jserver, rbuf);
plexus_cmd_server (jserver, 2, rbuf);
new_server (me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/plexus3.c b/src/protocol/plexus3.c
index d4054d230..05c4c01e7 100644
--- a/src/protocol/plexus3.c
+++ b/src/protocol/plexus3.c
@@ -1684,7 +1684,8 @@ plexus_cmd_jupe (char *jserver, char *who, char *reason)
snprintf (rbuf, sizeof (rbuf), "(H) Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- plexus_cmd_squit (jserver, rbuf);
+ if (findserver(servlist, jserver))
+ plexus_cmd_squit (jserver, rbuf);
plexus_cmd_server (jserver, 2, rbuf);
new_server (me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c
index 7711bae55..3c00496b0 100644
--- a/src/protocol/ptlink.c
+++ b/src/protocol/ptlink.c
@@ -1574,7 +1574,8 @@ void ptlink_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- ptlink_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ ptlink_cmd_squit(jserver, rbuf);
ptlink_cmd_server(jserver, 1, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/rageircd.c b/src/protocol/rageircd.c
index c437bd1c4..32b2a4709 100644
--- a/src/protocol/rageircd.c
+++ b/src/protocol/rageircd.c
@@ -1507,7 +1507,8 @@ void rageircd_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- rageircd_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ rageircd_cmd_squit(jserver, rbuf);
rageircd_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index b81291a16..3cfdded91 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1725,7 +1725,8 @@ void ratbox_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- ratbox_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ ratbox_cmd_squit(jserver, rbuf);
ratbox_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index 7a59115e7..46cdbfdbf 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -1679,7 +1679,8 @@ void shadowircd_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- shadowircd_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ shadowircd_cmd_squit(jserver, rbuf);
shadowircd_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/solidircd.c b/src/protocol/solidircd.c
index 44621f91a..5933c1cc1 100644
--- a/src/protocol/solidircd.c
+++ b/src/protocol/solidircd.c
@@ -1540,7 +1540,8 @@ void solidircd_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- solidircd_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ solidircd_cmd_squit(jserver, rbuf);
solidircd_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c
index bb0732e3c..7f674bd77 100644
--- a/src/protocol/ultimate2.c
+++ b/src/protocol/ultimate2.c
@@ -1565,7 +1565,8 @@ void ultimate2_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- ultimate2_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ ultimate2_cmd_squit(jserver, rbuf);
ultimate2_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c
index 2306a71c0..d1ff232b5 100644
--- a/src/protocol/ultimate3.c
+++ b/src/protocol/ultimate3.c
@@ -1648,7 +1648,8 @@ void ultimate3_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- ultimate3_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ ultimate3_cmd_squit(jserver, rbuf);
ultimate3_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/unreal31.c b/src/protocol/unreal31.c
index 7a8c2baf0..8ccb26ee2 100644
--- a/src/protocol/unreal31.c
+++ b/src/protocol/unreal31.c
@@ -1416,7 +1416,8 @@ void unreal_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- unreal_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ unreal_cmd_squit(jserver, rbuf);
unreal_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 4fffbfe98..ca6489a48 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1800,7 +1800,8 @@ void unreal_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- unreal_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ unreal_cmd_squit(jserver, rbuf);
unreal_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/protocol/viagra.c b/src/protocol/viagra.c
index 5cb5b2f40..bc8be5371 100644
--- a/src/protocol/viagra.c
+++ b/src/protocol/viagra.c
@@ -1547,7 +1547,8 @@ void viagra_cmd_jupe(char *jserver, char *who, char *reason)
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
reason ? ": " : "", reason ? reason : "");
- viagra_cmd_squit(jserver, rbuf);
+ if (findserver(servlist, jserver))
+ viagra_cmd_squit(jserver, rbuf);
viagra_cmd_server(jserver, 2, rbuf);
new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
}
diff --git a/src/servers.c b/src/servers.c
index ace20dfa8..cef8e01b5 100644
--- a/src/servers.c
+++ b/src/servers.c
@@ -158,11 +158,9 @@ Server *new_server(Server * uplink, const char *name, const char *desc,
if ((uplink == me_server) && !(flags & SERVER_JUPED))
serv_uplink = serv;
- /* Write the StartGlobal */
- if (GlobalOnCycle) {
- if (GlobalOnCycleUP)
- notice_server(s_GlobalNoticer, serv, "%s", GlobalOnCycleUP);
- }
+ /* Write the StartGlobal (to non-juped servers) */
+ if (GlobalOnCycle && GlobalOnCycleUP && !(flags & SERVER_JUPED))
+ notice_server(s_GlobalNoticer, serv, "%s", GlobalOnCycleUP);
return serv;
}
generated by cgit (git 2.34.1) at 2025-06-20 16:40:29 +0000