summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nickserv.c5
-rw-r--r--src/unreal32.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/nickserv.c b/src/nickserv.c
index 87a2228dc..0c76c3064 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -2045,12 +2045,15 @@ static int do_register(User * u)
}
if (!pass) {
- if (NSForceEmail && !email) {
+ if (NSForceEmail) {
syntax_error(s_NickServ, u, "REGISTER",
NICK_REGISTER_SYNTAX_EMAIL);
} else {
syntax_error(s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX);
}
+ } else if (NSForceEmail && !email) {
+ syntax_error(s_NickServ, u, "REGISTER",
+ NICK_REGISTER_SYNTAX_EMAIL);
} else if (time(NULL) < u->lastnickreg + NSRegDelay) {
notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, NSRegDelay);
} else if (u->na) { /* i.e. there's already such a nick regged */
diff --git a/src/unreal32.c b/src/unreal32.c
index 35316351e..22ed19965 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -212,7 +212,7 @@ char csmodes[128] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'a', 'a', 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'a', 0
};
CMMode cmmodes[128] = {