cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[svn] Merge old trunk r2817: 

WHOIS: Show the given nick in ERR_NOSUCHNICK even if it
starts with a digit. This is safe because the last
parameter is a nick and never a UID. (The first parameter
in a server-server two-param whois is a UID/SID.)
This commit is contained in:
jilles 2007-03-28 07:54:10 -07:00
parent a5ea0e0dc4
commit 8a1e143f6f
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
jilles 2007/03/28 14:49:48 UTC (20070328-3297)
Log:
Merge old trunk r2779,r2785:
Show correct privilege name in a few ERR_NOPRIVS numerics.
Changes: Modified:
+1 -1 trunk/extensions/m_ojoin.c (File Modified)
+1 -1 trunk/extensions/m_opme.c (File Modified)
+2 -2 trunk/unsupported/m_force.c (File Modified)
jilles 2007/03/28 14:45:46 UTC (20070328-3295) jilles 2007/03/28 14:45:46 UTC (20070328-3295)
Log: Log:
Merge old trunk r2695: Merge old trunk r2695:

2
include/serno.h
View File

@ -1 +1 @@
#define SERNO "20070328-3295" #define SERNO "20070328-3297"

6
modules/m_whois.c
View File

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: m_whois.c 3287 2007-03-28 13:49:57Z jilles $ * $Id: m_whois.c 3299 2007-03-28 14:54:10Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -67,7 +67,7 @@ mapi_hlist_av1 whois_hlist[] = {
{ NULL, NULL } { NULL, NULL }
}; };
DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3287 $"); DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3299 $");
/* /*
* m_whois * m_whois
@ -210,7 +210,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
else else
sendto_one_numeric(source_p, ERR_NOSUCHNICK, sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), form_str(ERR_NOSUCHNICK),
IsDigit(*nick) ? "*" : nick); nick);
sendto_one_numeric(source_p, RPL_ENDOFWHOIS, sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
form_str(RPL_ENDOFWHOIS), parv[1]); form_str(RPL_ENDOFWHOIS), parv[1]);