diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/bs_bot.c | 10 | ||||
| -rw-r--r-- | src/core/os_svsnick.c | 5 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 32ee6b7b8..04cc38b89 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -15,16 +15,6 @@ #include "module.h" -/** - * RFC: defination of a valid nick - * nickname = ( letter / special ) *8( letter / digit / special / "-" ) - * letter = %x41-5A / %x61-7A ; A-Z / a-z - * digit = %x30-39 ; 0-9 - * special = %x5B-60 / %x7B-7D ; "[", "]", "\", "`", "_", "^", "{", "|", "}" - **/ -#define isvalidnick(c) ( isalnum(c) || ((c) >='\x5B' && (c) <='\x60') || ((c) >='\x7B' && (c) <='\x7D') || (c)=='-' ) - - int do_bot(User * u); int delbot(BotInfo * bi); void myBotServHelp(User * u); diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index 9c0af28ca..d5d456aec 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -101,10 +101,9 @@ int do_svsnick(User * u) notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick); return MOD_CONT; } -#define isvalid(c) (((c) >= 'A' && (c) <= '~') || isdigit(c) || (c) == '-') for (c = newnick; *c && (c - newnick) < NICKMAX; c++) { - if (!isvalid(*c) || isspace(*c)) { - notice_lang(s_OperServ, u, NICK_X_ILLEGAL, nick); + if (!isvalidnick(*c)) { + notice_lang(s_OperServ, u, NICK_X_ILLEGAL, newnick); return MOD_CONT; } } |