summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/ns_forbid.c4
-rw-r--r--src/core/ns_register.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index adf620ff4..59d1abe45 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -85,6 +85,10 @@ int do_forbid(User * u)
if (readonly)
notice_lang(s_NickServ, u, READ_ONLY_MODE);
+ if (!anope_valid_nick(nick)) {
+ notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
+ return MOD_CONT;
+ }
if ((na = findnick(nick)) != NULL) {
if (NSSecureAdmins && nick_is_services_admin(na->nc)
&& !is_services_root(u)) {
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 92f4f0589..d26b7a0d6 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -132,6 +132,11 @@ int do_register(User * u)
return MOD_CONT;
}
+ if (!anope_valid_nick(u->nick)) {
+ notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
+ return MOD_CONT;
+ }
+
if (RestrictOperNicks) {
for (i = 0; i < RootNumber; i++) {
if (stristr(u->nick, ServicesRoots[i]) && !is_oper(u)) {