summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-04-27 18:56:39 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-04-27 18:56:39 +0000
commit6d0cdc16113bfa699073fbf4f137f7e52d3b3cfd (patch)
tree1888be6e2334c2ba100cf2fa6006ff0cf0cca36e
parent0eb9d4d0f258a8dddac7bdb709064876625348c1 (diff)
- Changed RPL_WELCOME to comply with rfc2812
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@1900 82007160-df01-0410-b94d-b575c5fd34c7
-rw-r--r--NEWS1
-rw-r--r--src/numeric.c2
-rw-r--r--src/s_user.c3
3 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 0ee8ce2..8ca0eb8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o) "STATS s" now shows configured services{} blocks as well
o) Fixed broken compile with libGeoIP disabled
o) Code cleanups; working towards stabilization and improved performance
+o) Changed RPL_WELCOME to comply with rfc2812
-- ircd-hybrid-8.1.0beta1 Release Notes
diff --git a/src/numeric.c b/src/numeric.c
index c8de49f..b42ea7e 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",
+/* 001 RPL_WELCOME */ ":%s 001 %s :Welcome to the %s Internet Relay Chat Network %s!%s@%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 biklmnoprstveIORS bkloveI",
diff --git a/src/s_user.c b/src/s_user.c
index 74a0bc5..702ce5d 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -1120,7 +1120,8 @@ 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);
+ ServerInfo.network_name, source_p->name,
+ source_p->username, source_p->host);
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),