welcome: throw error when name param is empty (only had prefixes)

[irc/quakenet/snircd-patchqueue.git] / welcome.patch

diff --git a/welcome.patch b/welcome.patch
index d48c4453f5a0d32f67d94d87dac9dad0d06a2252..3d686d14d0f184cca2a4995bddb300722ce263fc 100644 (file)
--- a/welcome.patch
+++ b/welcome.patch
@@ -768,7 +768,7 @@ diff -r 211f48754a7f ircd/s_user.c
 diff -r 211f48754a7f ircd/welcome.c
 --- /dev/null
 +++ b/ircd/welcome.c
-@@ -0,0 +1,465 @@
+@@ -0,0 +1,474 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/welcome.c
 + * Copyright (C) 1990 Jarkko Oikarinen and
@@ -875,6 +875,15 @@ diff -r 211f48754a7f ircd/welcome.c
 +  Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", \"%s\" \"%s\", %Tu, 0x%04x, %d)",
 +   cli_name(cptr), cli_name(sptr), name, text, who, timestamp, flags, insert));
 +
++  /* name empty after taking off the prefixes? */
++  if (EmptyString(name)) {
++    if (IsUser(sptr))
++      sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :WELCOME: No message number given", sptr);
++    else 
++      protocol_violation(cptr, "WELCOME: No message number given by %C", sptr);
++    return 0;
++  }
++
 +  /* check name */
 +  if (nameint < 1 || nameint > WELCOME_MAX_ENTRIES) {
 +    if (IsUser(sptr))