diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | data/example.conf | 13 | ||||
| -rw-r--r-- | src/config.c | 13 | ||||
| -rw-r--r-- | version.log | 6 |
4 files changed, 23 insertions, 10 deletions
@@ -4,6 +4,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005 10/01 A Information on uplink server can be displayed via OperServ STATS. [ #00] 09/29 A Configuration option to change fantasy command prefix character. [ #00] 09/28 A Event for fantasy commands triggered without channel access. [ #00] +10/05 F Changed NickLen and BSFantasyChar into recommended and optional. [ #00] 10/04 F Added missing hs_request to win32 modules makefile. [ #00] 10/03 F Changed error on identical userkeys into a warning. [ #00] 10/02 F Added check in OperServ stats to avoid segfault without param. [ #00] diff --git a/data/example.conf b/data/example.conf index b839bc71e..b5a3a82d0 100644 --- a/data/example.conf +++ b/data/example.conf @@ -320,7 +320,7 @@ NetworkName "LocalNet" # consult your ircds documentation before using this #Numeric "64" -# NickLen [REQUIRED] +# NickLen [RECOMMENDED] # Set this to the maximum allowed nick length on your network. Anope does # not support values larger than 31, so setting them makes no sense. Be # sure to set this correctly, as setting this wrong can result in services @@ -1048,13 +1048,14 @@ BSGentleBWReason # BSCaseSensitive -# BSFantasyCharacter [REQUIRED] +# BSFantasyCharacter [OPTIONAL] # This option allows you to change the default prefix for fantasy -# commands in channels. This character will have to be prepended to all -# fantasy commands. If you choose "!" (the default), fantasy commands -# will, for example, be "!kick", "!op", etc. +# commands in channels. This character will have to be prepended to +# all fantasy commands. If you choose "!", fantasy commands will, for +# example, be "!kick", "!op", etc. If left out, the default fantasy +# character will be "!". -BSFantasyCharacter "!" +# BSFantasyCharacter "!" ########################################################################### # diff --git a/src/config.c b/src/config.c index d9566f073..e08afa682 100644 --- a/src/config.c +++ b/src/config.c @@ -950,7 +950,6 @@ int read_config(int reload) CHECK(RemoteServer); CHECK(ServerName); CHECK(ServerDesc); - CHECK(NickLen); if (RemoteServer3) CHECK(RemoteServer2); @@ -967,8 +966,15 @@ int read_config(int reload) } } - if (NickLen >= NICKMAX) + if (NickLen == 0) { + alog("You have not defined the NickLen configuration directive. It is strongly"); + alog("advised that you do configure this correctly in your services.conf"); NickLen = NICKMAX - 1; + } else if ((NickLen < 1) || (NickLen >= NICKMAX)) { + alog("NickLen has an invalid value; setting to %d", + (NICKMAX - 1)); + NickLen = NICKMAX - 1; + } } CHECK(IRCDModule); @@ -1319,7 +1325,6 @@ int read_config(int reload) CHECK(BSBadWordsMax); CHECK(BSMinUsers); CHECK(BSKeepData); - CHECK(BSFantasyCharacter); if (s_BotServAlias) { if (!stricmp(s_BotServ, s_BotServAlias)) { printf @@ -1327,6 +1332,8 @@ int read_config(int reload) retval = 0; } } + if (!BSFantasyCharacter) + BSFantasyCharacter = "!"; if (BSFantasyCharacter && (strlen(BSFantasyCharacter) > 1)) { printf ("*** BSFantasyCharacter is more than 1 character long. Only the first\n" diff --git a/version.log b/version.log index dcf1b6724..4da5a1906 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="11" VERSION_EXTRA="-svn" -VERSION_BUILD="912" +VERSION_BUILD="913" # $Log$ # +# BUILD : 1.7.11 (913) +# BUGS : +# NOTES : Turned NickLen into RECOMMENDED and BSFantasyCharacter into OPTIONAL +# # BUILD : 1.7.11 (912) # BUGS : # NOTES : Turned identical userkeys error into a warning and added hs_request to src/modules/makefile.inc.win32 |