diff options
| author | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-11-12 19:53:10 +0000 |
|---|---|---|
| committer | trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-11-12 19:53:10 +0000 |
| commit | ee7afa7ecaba6a1051f5ef4e0f493344e2322568 (patch) | |
| tree | 392267405c897e7bcfee6108a99685729abb1ac9 | |
| parent | f0c53b4727bf64c280b49cb7c15c6ba77c6b1dc5 (diff) | |
BUILD : 1.7.6 (441) BUGS : 215, 216 NOTES : Fixed some last minute bugs, and fixed make strict under Redhat
git-svn-id: svn://svn.anope.org/anope/trunk@441 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@296 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | include/sysconf.h.in | 3 | ||||
| -rw-r--r-- | src/nickserv.c | 5 | ||||
| -rw-r--r-- | src/unreal32.c | 2 | ||||
| -rw-r--r-- | version.log | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/include/sysconf.h.in b/include/sysconf.h.in index e86659d1c..8d8a0e292 100644 --- a/include/sysconf.h.in +++ b/include/sysconf.h.in @@ -213,9 +213,8 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap); /* Freebsd 5.2.1 actually has u_char those it throws more errors having it defined again - TSL */ -#ifndef HAS_SYS_TYPES_H +#undef u_char typedef unsigned char u_char; -#endif #endif 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] = { diff --git a/version.log b/version.log index fa301a114..ae67a3a8c 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="6" -VERSION_BUILD="440" +VERSION_BUILD="441" # $Log$ # +# BUILD : 1.7.6 (441) +# BUGS : 215, 216 +# NOTES : Fixed some last minute bugs, and fixed make strict under Redhat +# # BUILD : 1.7.6 (440) # BUGS : 211 # NOTES : 1. Updated PTLink support, 2. OperServ takes +q/+a on CLEARMODES, 3. fixed a segfault in do_match_wild() |