summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/ns_forbid.c4
-rw-r--r--src/core/ns_register.c5
-rw-r--r--version.log6
3 files changed, 14 insertions, 1 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)) {
diff --git a/version.log b/version.log
index 915380f49..3e3150179 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="13"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1000"
+VERSION_BUILD="1001"
# $Log$
#
+# BUILD : 1.7.13 (1001)
+# BUGS :
+# NOTES : NickServ will now check anope_valid_nick()
+#
# BUILD : 1.7.13 (1000)
# BUGS : 424
# NOTES : Added TS6 Save support. This is #1000!