summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--src/numeric.c2
-rw-r--r--src/s_user.c3
3 files changed, 2 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 1ec9eb7..9e72d88 100644
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,6 @@ o) Removed channel::quiet_on_ban configuration option. This feature is
-- ircd-hybrid-8.1.0beta2 Release Notes
o) Fixed broken compile with libGeoIP disabled
o) Code cleanups; working towards stabilization and improved performance
-o) Changed RPL_WELCOME to comply with rfc2812
o) Removed operflag 'nick_changes'. Operators can now set +n at will
o) Fixed shared{} blocks not working as expected
o) Fixed spoofs not working as expected
diff --git a/src/numeric.c b/src/numeric.c
index 30856a6..90842dd 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -28,7 +28,7 @@
static const char *replies[] = {
/* 000 */ NULL,
-/* 001 RPL_WELCOME */ ":%s 001 %s :Welcome to the %s Internet Relay Chat Network %s!%s@%s",
+/* 001 RPL_WELCOME */ ":%s 001 %s :Welcome to the %s Internet Relay Chat Network %s",
/* 002 RPL_YOURHOST */ ":%s 002 %s :Your host is %s, running version %s",
/* 003 RPL_CREATED */ ":%s 003 %s :This server was created %s",
/* 004 RPL_MYINFO */ ":%s 004 %s %s %s %s bciklmnoprstveIMORS bkloveI",
diff --git a/src/s_user.c b/src/s_user.c
index a6f82d5..0f33e6c 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -1095,8 +1095,7 @@ user_welcome(struct Client *source_p)
#endif
sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
- ServerInfo.network_name, source_p->name,
- source_p->username, source_p->host);
+ ServerInfo.network_name, source_p->name);
sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
get_listener_name(source_p->localClient->listener), ircd_version);
sendto_one(source_p, form_str(RPL_CREATED),