summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/bahamut.c2
-rw-r--r--src/dreamforge.c2
-rw-r--r--src/hybrid.c2
-rw-r--r--src/messages.c4
-rw-r--r--src/plexus.c2
-rw-r--r--src/ptlink.c2
-rw-r--r--src/rageircd.c2
-rw-r--r--src/ratbox.c2
-rw-r--r--src/shadowircd.c2
-rw-r--r--src/solidircd.c2
-rw-r--r--src/ultimate2.c2
-rw-r--r--src/ultimate3.c2
-rw-r--r--src/unreal31.c2
-rw-r--r--src/unreal32.c2
-rw-r--r--src/viagra.c2
-rw-r--r--version.log6
17 files changed, 22 insertions, 17 deletions
diff --git a/Changes b/Changes
index c09556a00..fed6e0cfd 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005
02/13 A Internal Event support, see EVENTS in the doc folder for help [ #00]
02/05 A Support for Unreal 3.2 +I channel mode. [ #00]
02/03 A Merged anope-win32 branch into the main, now Win32 ready. [ #00]
+03/16 F Send the correct numeric for a missing MOTD file. [#315]
03/16 F Wrong modes being set in certain cases with SJOIN. [#320]
03/14 F Two normalized strings not being freed. [#314]
03/14 F Various minor mistakes (see bugreport for full list). [#313]
diff --git a/src/bahamut.c b/src/bahamut.c
index a54cd4988..28b8ec79a 100644
--- a/src/bahamut.c
+++ b/src/bahamut.c
@@ -1391,7 +1391,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/dreamforge.c b/src/dreamforge.c
index c4b3dc5f0..9174353f7 100644
--- a/src/dreamforge.c
+++ b/src/dreamforge.c
@@ -1168,7 +1168,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/hybrid.c b/src/hybrid.c
index 763bca0fe..55c1cf69b 100644
--- a/src/hybrid.c
+++ b/src/hybrid.c
@@ -1022,7 +1022,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/messages.c b/src/messages.c
index e6ad168f7..695acbd8b 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -93,17 +93,17 @@ int m_motd(char *source)
}
f = fopen(MOTDFilename, "r");
- anope_cmd_375(source);
if (f) {
+ anope_cmd_375(source);
while (fgets(buf, sizeof(buf), f)) {
buf[strlen(buf) - 1] = 0;
anope_cmd_372(source, buf);
}
fclose(f);
+ anope_cmd_376(source);
} else {
anope_cmd_372_error(source);
}
- anope_cmd_376(source);
return MOD_CONT;
}
diff --git a/src/plexus.c b/src/plexus.c
index 538b19a8f..e008f5018 100644
--- a/src/plexus.c
+++ b/src/plexus.c
@@ -1104,7 +1104,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/ptlink.c b/src/ptlink.c
index 7528351f9..d7c848953 100644
--- a/src/ptlink.c
+++ b/src/ptlink.c
@@ -1368,7 +1368,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/rageircd.c b/src/rageircd.c
index f6b968496..196243ca3 100644
--- a/src/rageircd.c
+++ b/src/rageircd.c
@@ -1040,7 +1040,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/ratbox.c b/src/ratbox.c
index b8db22dd6..f2b329e4a 100644
--- a/src/ratbox.c
+++ b/src/ratbox.c
@@ -1205,7 +1205,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
send_cmd((UseTS6 ? TS6SID : ServerName),
- "372 %s :- MOTD file not found! Please "
+ "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/shadowircd.c b/src/shadowircd.c
index 0f2920016..d9cd1c7d0 100644
--- a/src/shadowircd.c
+++ b/src/shadowircd.c
@@ -1185,7 +1185,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
send_cmd(TS6SID,
- "372 %s :- MOTD file not found! Please "
+ "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/solidircd.c b/src/solidircd.c
index 4cf78e85a..a4bbbb714 100644
--- a/src/solidircd.c
+++ b/src/solidircd.c
@@ -1415,7 +1415,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/ultimate2.c b/src/ultimate2.c
index 149e94236..efc9171e9 100644
--- a/src/ultimate2.c
+++ b/src/ultimate2.c
@@ -1512,7 +1512,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/ultimate3.c b/src/ultimate3.c
index b4f9c3176..b6a840a48 100644
--- a/src/ultimate3.c
+++ b/src/ultimate3.c
@@ -1053,7 +1053,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/unreal31.c b/src/unreal31.c
index 254e3137c..d8db1d259 100644
--- a/src/unreal31.c
+++ b/src/unreal31.c
@@ -567,7 +567,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/unreal32.c b/src/unreal32.c
index 3a520e086..d2051b160 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -854,7 +854,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/src/viagra.c b/src/viagra.c
index de1ef6074..529dfc704 100644
--- a/src/viagra.c
+++ b/src/viagra.c
@@ -1527,7 +1527,7 @@ void anope_cmd_372(char *source, char *msg)
void anope_cmd_372_error(char *source)
{
- send_cmd(ServerName, "372 %s :- MOTD file not found! Please "
+ send_cmd(ServerName, "422 %s :- MOTD file not found! Please "
"contact your IRC administrator.", source);
}
diff --git a/version.log b/version.log
index b45a639d1..a84bc30bf 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="8"
-VERSION_BUILD="631"
+VERSION_BUILD="632"
# $Log$
#
+# BUILD : 1.7.8 (632)
+# BUGS : 315
+# NOTES : 422 is sent if the file dosnt exist, 375 and 376 are no longer sent, if the error numeric is sent.
+#
# BUILD : 1.7.8 (631)
# BUGS : 320
# NOTES : Fixed an error in the big if/else if thing when setting the modes on SJOIN, should now give correct modes