Anope 2.0.0 Release

finish syncing later when the uplink syncs. Normally the channel state
is fully synced here anyway, except if we do not know the modes the
uplink has yet.

Also fix a related issue with resetting chanels and bouncing modes on
our clients, if this is done prior to knowing which modes exist it would
silently fail.

CMakeLists.txt

@@ -497,6 +497,10 @@ if(WIN32)
   install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat
     DESTINATION ${BIN_DIR}
   )
+
+  # Package any DLLs in src/win/
+  file(GLOB EXTRA_DLLS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${Anope_SOURCE_DIR}/src/win32/*.dll")
+  install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR})
 endif(WIN32)
 
 install(CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")")

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2011 Anope team
+# Anope (c) 2003-2014 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -130,7 +130,7 @@ export ECHO2 ECHO2SUF
 INSTDIR=$HOME/services
 RUNGROUP=
 UMASK=
-DEBUG="yes"
+DEBUG="no"
 USE_RUN_CC_PL="no"
 USE_PCH="no"
 EXTRA_INCLUDE_DIRS=

data/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Only install example.chk and example.conf from this directory
 # NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
-set(DATA example.chk botserv.example.conf example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf)
+set(DATA example.chk botserv.example.conf example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
 install(FILES ${DATA}
   DESTINATION ${CONF_DIR}
 )

data/botserv.example.conf

@@ -3,13 +3,23 @@
  */
 
 /*
- * First, create the service.
- * Note that an easy way to rename this service is to define{} the client name to something else.
+ * First, create the service. If you do not want to have a 'BotServ', but do want the ability to have
+ * ChanServ assigned to channels for the use of fantasy commands, you may delete the below 'service' block.
+ *
+ * Note that deleting a 'service' block for a pseudoclient that is already online will not remove the
+ * client, the client becomes no different from a normal service bot, so you will have to use botserv/bot
+ * to manually delete the client.
+ *
+ * You may then waant to map some of the below commands to other services, like placing botserv/bot on
+ * OperServ so you can delete the below client, and mapping assign and unassign to ChanServ so users are
+ * able to control whether or not ChanServ is in the channel. You may also want to map botserv/set/nobot
+ * to OperServ so you can restrict who can assign the other core service clients.
  */
 service
 {
 	/*
 	 * The name of the BotServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the botserv module too.
 	 */
 	nick = "BotServ"
 
@@ -62,6 +72,8 @@ module
 
 	/*
 	 * The name of the client that should be BotServ.
+	 *
+	 * This directive is optional.
 	 */
 	client = "BotServ"
 
@@ -147,9 +159,10 @@ command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"
  *
  * Allows service bots to be automatically assigned to channels upon registration.
  */
-#module { name = "bs_autoassign" }
-bs_autoassign
+#module
 {
+	name = "bs_autoassign"
+
 	/*
 	 * Automatically assign ChanServ to channels upon registration.
 	 */
@@ -261,7 +274,6 @@ module
 	 */
 	gentlebadwordreason = yes
 }
-
 command { service = "BotServ"; name = "KICK"; command = "botserv/kick"; }
 command { service = "BotServ"; name = "KICK AMSG"; command = "botserv/kick/amsg"; }
 command { service = "BotServ"; name = "KICK BADWORDS"; command = "botserv/kick/badwords"; }
@@ -277,6 +289,7 @@ command { service = "BotServ"; name = "KICK UNDERLINES"; command = "botserv/kick
 command { service = "BotServ"; name = "SET DONTKICKOPS"; command = "botserv/set/dontkickops"; }
 command { service = "BotServ"; name = "SET DONTKICKVOICES"; command = "botserv/set/dontkickvoices"; }
 
+
 /*
  * bs_set
  *

data/chanserv.example.conf

@@ -4,12 +4,12 @@
 
 /*
  * First, create the service.
- * Note that an easy way to rename this service is to define{} the client name to something else.
  */
 service
 {
 	/*
 	 * The name of the ChanServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the chanserv module too.
 	 */
 	nick = "ChanServ"
 
@@ -114,6 +114,7 @@ module
 
 	/*
 	 * The maximum number of entries on a channel's access list.
+	 * If not set, the default is 1024. This can be set to 0 for unlimited.
 	 */
 	accessmax = 1024
 
@@ -172,18 +173,18 @@ module
  * ChanServ privilege configuration.
  *
  * ChanServ privileges are used to determine who has what access in channels. By default the core has its own
- * set of levels it uses for various ChanServ commands, which are defined below. Privilege ranks are used to
- * determine how powerful privileges are relative to each other, which is used by Anope to determine who has greater
- * access in a channel.
+ * set of privileges it uses for various commands, which are defined below. Privilege ranks are used to
+ * determine how powerful privileges are relative to other privileges, which is used by Anope to determine
+ * who has greater access in a channel.
  *
- * If you loaded cs_access, you may define a level for the privilege, which is used by chanserv/access and chanserv/levels.
+ * If you load cs_access, you may define a level for the privilege, which is used by chanserv/access and chanserv/levels.
  * The levels defined will be used as the default levels for newly registered channels.
  * The level "founder" is a special level which means anyone with the privilege FOUNDER on the channel
  * has that permission. Additionally, the level "disabled" means that no one can use the privilege, including founders.
  *
- * If you loaded cs_flags, you may define a flag associated with that privilege for use in chanserv/flags.
+ * If you load cs_flags, you may define a flag associated with that privilege for use in chanserv/flags.
  *
- * If you loaded cs_xop, you may define a xop command to associate the privilege with.
+ * If you load cs_xop, you may define a XOP command to associate the privilege with.
  *
  * The name of privileges are uesd to associate them with channel modes. If you are using an IRCd that allows you to define additional
  * channel status modes, such as InspIRCd, you can associate privileges (and thus access levels, flags, xop) with the mode by naming
@@ -402,7 +403,7 @@ privilege
 {
 	name = "FOUNDER"
 	rank = 360
-	level = "founder"
+	level = 10000
 	flag = "F"
 	xop = "QOP"
 }
@@ -828,7 +829,12 @@ command { service = "ChanServ"; name = "HELP"; command = "generic/help"; }
  * Provides commands chanserv/access and chanserv/levels.
  * Provides the access system "levels".
  *
- * Used for giving users access in channels.
+ * Used for giving users access in channels using a levels system. Allows allows redefining which privileges
+ * are representated by given level on a per channel basis.
+ *
+ * The "LIST" subcommand of chanserv/access will show every access entry on the channel, including access
+ * entries not added by cs_access. The "level" of these entries will be the representation of the access
+ * entry by the other access system, which could be an XOP command name, or a set of flags.
  */
 module { name = "cs_access" }
 command { service = "ChanServ"; name = "ACCESS"; command = "chanserv/access"; group = "chanserv/access"; }
@@ -855,7 +861,6 @@ module
 	 */
 	autokickreason = "User has been banned from the channel"
 }
-
 command { service = "ChanServ"; name = "AKICK"; command = "chanserv/akick"; group = "chanserv/management"; }
 
 /*
@@ -921,6 +926,10 @@ command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"
  * Provides the access system "flags".
  *
  * Used for giving users access in channels.
+ *
+ * The "LIST" subcommand of chanserv/flags will show every access entry on the channel, including access
+ * entries not added by cs_flags. The "Flags" of these entries will be the flags representation of the
+ * privilege set granted by the access entry. 
  */
 module { name = "cs_flags" }
 command { service = "ChanServ"; name = "FLAGS"; command = "chanserv/flags"; group = "chanserv/access"; }
@@ -981,10 +990,11 @@ module
 	 */
 	listmax = 50
 }
+command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; }
 
-command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; permission = "chanserv/list"; group = "chanserv/admin"; }
 command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/private"; }
 
+
 /*
  * cs_log
  *
@@ -1031,7 +1041,9 @@ command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group =
  *
  * Provides the command chanserv/mode and chanserv/modes.
  *
- * Used for changing mode locks and changing modes.
+ * Used for changing mode locks and changing modes. Multiple commands may be mapped to chanserv/modes, the
+ * configuration directive 'set' and 'unset' are used to tell chanserv/modes which modes should be set or
+ * unset when the command is executed.
  */
 module
 {
@@ -1044,7 +1056,6 @@ module
 	 */
 	mlock = "+nt"
 }
-
 command { service = "ChanServ"; name = "MODE"; command = "chanserv/mode"; group = "chanserv/management"; }
 
 command { service = "ChanServ"; name = "OWNER"; command = "chanserv/modes"; group = "chanserv/status"; set = "OWNER" }
@@ -1062,6 +1073,7 @@ command { service = "ChanServ"; name = "DEHALFOP"; command = "chanserv/modes"; g
 command { service = "ChanServ"; name = "VOICE"; command = "chanserv/modes"; group = "chanserv/status"; set = "VOICE" }
 command { service = "ChanServ"; name = "DEVOICE"; command = "chanserv/modes"; group = "chanserv/status"; unset = "VOICE" }
 
+
 /*
  * cs_register
  *
@@ -1132,8 +1144,13 @@ module
 	 * 3: ban in the form of *!*user@*.domain
 	 */
 	defbantype = 2
-}
 
+	/*
+	 * If set, persisent channels have their creation times lowered to their
+	 * original registration dates.
+	 */
+	persist_lower_ts = true
+}
 command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; group = "chanserv/management"; }
 command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; }
 command { service = "ChanServ"; name = "SET BANTYPE"; command = "chanserv/set/bantype"; }
@@ -1249,6 +1266,9 @@ command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "c
  * privileges given by each is determined by the privilege:xop settings above. These commands should
  * be ordered from highest to lowest, as each command inherits the privileges of the commands below
  * it.
+ *
+ * The "LIST" subcommand of chanserv/xop will show only XOP access entries of the given XOP type. You
+ * can not view the entire access list at once, and instead should use another access system to do that.
  */
 module { name = "cs_xop" }
 command { service = "ChanServ"; name = "QOP"; command = "chanserv/xop"; group = "chanserv/access"; }

data/chanstats.example.conf

@@ -26,10 +26,9 @@ module
 
 	/*
 	 * Enable Chanstats for newly registered nicks / channels.
-	 * Set it to 0 to disable it.
 	 */
-	NSDefChanstats = 1
-	CSDefChanstats = 1
+	ns_def_chanstats = yes
+	cs_def_chanstats = yes
 }
 command { service = "ChanServ"; name = "SET CHANSTATS"; command = "chanserv/set/chanstats"; }
 command { service = "NickServ"; name = "SET CHANSTATS"; command = "nickserv/set/chanstats"; }
@@ -38,9 +37,15 @@ command { service = "NickServ"; name = "SASET CHANSTATS"; command = "nickserv/sa
 module { name = "cs_fantasy_stats" }
 command { service = "ChanServ"; name = "STATS"; command = "chanserv/stats"; }
 command { service = "ChanServ"; name = "GSTATS"; command = "chanserv/gstats"; }
+fantasy { name = "STATS"; command = "chanserv/stats"; }
+fantasy { name = "GSTATS"; command = "chanserv/gstats"; }
 
 module { name = "cs_fantasy_top" }
 command { service = "ChanServ"; name = "TOP"; command = "chanserv/top"; }
 command { service = "ChanServ"; name = "TOP10"; command = "chanserv/top10"; }
 command { service = "ChanServ"; name = "GTOP"; command = "chanserv/gtop"; }
 command { service = "ChanServ"; name = "GTOP10"; command = "chanserv/gtop10"; }
+fantasy { name = "TOP"; command = "chanserv/top"; }
+fantasy { name = "TOP10"; command = "chanserv/top10"; }
+fantasy { name = "GTOP"; command = "chanserv/gtop"; }
+fantasy { name = "GTOP10"; command = "chanserv/gtop10"; }

data/example.conf

@@ -80,16 +80,7 @@
  * [OPTIONAL] Defines
  *
  * You can define values to other values, which can be used to easily change
- * every value in the configuration. For example, use:
- *
- * define
- * {
- * 	name = "ChanServ"
- *	value = "ChannelServ"
- * }
- *
- * To replace every occurrence of ChanServ with ChannelServ in the configuration file,
- * and in every included configuration file (such as chanserv.example.conf).
+ * many values in the configuration. at once.
  */
 
 /*
@@ -177,7 +168,7 @@ uplink
 
 	/*
 	 * Enable if Services should connect using SSL.
-	 * You must have m_ssl loaded for this to work.
+	 * You must have an SSL module loaded for this to work.
 	 */
 	ssl = no
 
@@ -285,13 +276,6 @@ module
 	 * If the protocol module you have loaded does not support this, this setting will have no effect.
 	 */
 	use_server_side_topiclock = yes
-
-	/*
-	 * Some IRCds allow "SASL" authentication to let users identify to Services
-	 * during the IRCd user registration process. If set, Services will allow
-	 * authenticating users through this mechanism.
-	 */
-	sasl = yes
 }
 
 /*
@@ -392,11 +376,6 @@ options
 	 */
 	casemap = "ascii"
 
-	/*
-	 * The maximum length of passwords
-	 */
-	passlen = 32
-
 	/*
 	 * This key is used to initiate the random number generator. This number
 	 * MUST be random as you want your passcodes to be random. Don't give this
@@ -526,15 +505,16 @@ options
 	retrywait = 60s
 
 	/*
-	 * If set, Services will hide commands that users don't have the privileges to execute
+	 * If set, Services will hide commands that users don't have the privilege to execute
 	 * from HELP output.
 	 */
 	hideprivilegedcommands = yes
 
 	/*
-	 * If set, Services do not allow ownership of nick names, only ownership of accounts.
+	 * If set, Services will hide commands that users can't execute because they are not
+	 * logged in from HELP output.
 	 */
-	nonicknameownership = no
+	hideregisteredcommands = yes
 
 	/* The regex engine to use, as provided by the regex modules.
 	 * Leave commented to disable regex matching.
@@ -554,27 +534,9 @@ options
 
 	/*
 	 * Default language that non- and newly-registered nicks will receive messages in.
-	 * Leave empty to default to English.
+	 * Set to "en" to enable English. Defaults to the language the system uses.
 	 */
 	#defaultlanguage = "es_ES.UTF-8"
-
-	/*
-	 * The username, and possibly hostname, used for fake users created when Services needs to
-	 * hold a nickname.
-	 */
-	enforceruser = "enforcer"
-	enforcerhost = "localhost.net"
-
-	/*
-	 * The length of time Services hold nicknames.
-	 */
-	releasetimeout = 1m
-
-	/*
-	 * When a user's nick is forcibly changed to enforce a "nick kill", their new nick will start
-	 * with this value. The rest will be made up of 6 or 7 digits.
-	 */
-	guestnickprefix = "Guest"
 }
 
 /*
@@ -747,7 +709,7 @@ log
 	 *
 	 * Note that modules may add their own values to these options.
 	 */
-	admin = "operserv/*"
+	admin = "*"
 	override = "chanserv/* nickserv/* memoserv/set ~botserv/set botserv/*"
 	commands = "~operserv/* *"
 	servers = "*"
@@ -798,6 +760,8 @@ log
  *  nickserv/auspex               - Can see any information with /nickserv info
  *  nickserv/confirm              - Can confirm other users nicknames
  *  nickserv/drop                 - Can drop other users nicks
+ *  operserv/config               - Can modify services's configuration
+ *  protected                     - Can not be kicked from channels by Services
  *
  * Available commands:
  *   botserv/bot/del          botserv/bot/add               botserv/bot/change        botserv/set/private
@@ -816,7 +780,7 @@ log
  *   memoserv/sendall        memoserv/staff
  *
  *   nickserv/getpass        nickserv/getemail      nickserv/suspend      nickserv/ajoin
- *   nickserv/resetpass      nickserv/list
+ *   nickserv/list
  *
  *   nickserv/saset/autoop     nickserv/saset/email   nickserv/saset/greet     nickserv/saset/password
  *   nickserv/saset/display    nickserv/saset/kill    nickserv/saset/language  nickserv/saset/message
@@ -862,7 +826,7 @@ opertype
 	inherits = "Helper, Another Helper"
 
 	/* What commands (see above) this opertype may use */
-	commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/akill operserv/session operserv/modinfo operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline"
+	commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/suspend operserv/mode operserv/chankill operserv/akill operserv/session operserv/modinfo operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline"
 
 	/* What privs (see above) this opertype has */
 	privs = "chanserv/auspex chanserv/no-register-limit memoserv/* nickserv/auspex nickserv/confirm"
@@ -988,18 +952,6 @@ mail
 	 */
 	sendfrom = "services@localhost.net"
 
-	/*
-	 * If set, RESETPASS will be restricted to services operators with access to
-	 * nickserv/resetpass in their opertype:commands.
-	 * This directive is optional.
-	 *
-	 * WARNING: If you choose to not enable this option, you should limit the
-	 * number of processes that the services user can have at a time (you can
-	 * create a special user for this; remember to NEVER launch Services as
-	 * root).
-	 */
-	restrict = yes
-
 	/*
 	 * This controls the minimum amount of time a user must wait before sending
 	 * another e-mail after they have sent one. It also controls the minimum time
@@ -1096,29 +1048,12 @@ mail
 	/*
 	 * This is the encryption type used by the databases. This must be set correctly or
 	 * your passwords will not work. Valid options are: md5, oldmd5, sha1, and plain.
+	 * You must also be sure to load the correct encryption module below in the Encryption
+	 * Modules section so that your passwords work.
 	 */
 	#hash = "md5"
 }
 
-/*
- * [DEPRECATED] db_plain
- *
- * This is the flatfile database format from Anope-1.9.2 to Anope-1.9.5.
- * This module only loads this database, and will NOT save it.
- * To convert from this format, load both this and db_flatfile. Be sure to name db_flatfile's
- * target database to something else. Start Anope then shut down so the new database will be written.
- * Then unload this and restart Anope, loading from the new database.
- */
-#module
-{
-	name = "db_plain"
-
-	/*
-	 * The database name db_plain should use
-	 */
-	database = "anope.db"
-}
-
 /*
  * [RECOMMENDED] db_flatfile
  *
@@ -1257,8 +1192,9 @@ module
  * encrypted by this module. Old passwords stored in another encryption method are
  * automatically re-encrypted by the primary encryption module on next identify.
  *
- * NOTE: enc_old is Anope's previous (broken) MD5 implementation, if your databases
- * were made using that module, continue to use it and do not use enc_md5.
+ * NOTE: enc_old is Anope's previous (broken) MD5 implementation which is present in
+ * versions prior to Anope 1.7.17. If your databases were made using that module,
+ * use this and not enc_md5.
  *
  * NOTE: enc_sha1 relies on how the OS stores 2+ byte data internally, and is
  * potentially broken when moving between 2 different OSes, such as moving from
@@ -1269,6 +1205,7 @@ module
  *
  */
 
+#module { name = "enc_bcrypt" }
 module { name = "enc_sha256" }
 #module { name = "enc_md5" }
 #module { name = "enc_sha1" }
@@ -1303,3 +1240,16 @@ include
 	type = "file"
 	name = "chanstats.example.conf"
 }
+
+/*
+ * IRC2SQL Gateway
+ * This module collects data about users, channels and servers. It doesn't build stats
+ * itself, however, it gives you the database, it's up to you how you use it.
+ *
+ * Requires a MySQL Database and MySQL version 5.5 or higher
+ */
+#include
+{
+	type = "file"
+	name = "irc2sql.example.conf"
+}

data/global.example.conf

@@ -4,12 +4,12 @@
 
 /*
  * First, create the service.
- * Note that an easy way to rename this service is to define{} the client name to something else.
  */
 service
 {
 	/*
 	 * The name of the Global client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the global module too.
 	 */
 	nick = "Global"
 

data/hostserv.example.conf

@@ -4,12 +4,12 @@
 
 /*
  * First, create the service.
- * Note that an easy way to rename this service is to define{} the client name to something else.
  */
 service
 {
 	/*
 	 * The name of the HostServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the hostserv module too.
 	 */
 	nick = "HostServ"
 
@@ -103,7 +103,20 @@ command { service = "HostServ"; name = "DELALL"; command = "hostserv/delall"; pe
  *
  * Used for grouping one vHost to many nicks.
  */
-module { name = "hs_group" }
+module
+{
+	name = "hs_group"
+
+	/*
+	 * Upon nickserv/group, this option syncs the nick's main vHost to the grouped nick.
+	 */
+	syncongroup = false
+
+	/*
+	 * This makes vhosts act as if they are per account.
+	 */
+	synconset = false
+}
 command { service = "HostServ"; name = "GROUP"; command = "hostserv/group"; }
 
 /*
@@ -139,7 +152,7 @@ command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
 /*
  * hs_request
  *
- * Provides the commands hostserv/request, hostserv/active, hostserv/reject, and hostserv/waiting.
+ * Provides the commands hostserv/request, hostserv/activate, hostserv/reject, and hostserv/waiting.
  *
  * Used to manage vHosts requested by users.
  */

data/irc2sql.example.conf

@@ -0,0 +1,98 @@
+/*
+ * Example configuration file for the irc2sql gateway
+ *
+ */
+
+service
+{
+	/*
+	 * The name of the StatServ client.
+	 */
+	nick = "StatServ"
+
+	/*
+	 * The username of the StatServ client.
+	 */
+	user = "StatServ"
+
+	/*
+	 * The hostname of the StatServ client.
+	 */
+	host = "services.host"
+
+	/*
+	 * The realname of the StatServ client.
+	 */
+	gecos = "Statistical Service"
+
+	/*
+	 * The modes this client should use.
+	 * Do not modify this unless you know what you are doing.
+	 *
+	 * These modes are very IRCd specific. If left commented, sane defaults
+	 * are used based on what protocol module you have loaded.
+	 *
+	 * Note that setting this option incorrectly could potentially BREAK some, if
+	 * not all, usefulness of the client. We will not support you if this client is
+	 * unable to do certain things if this option is enabled.
+	 */
+	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
+	 */
+	#channels = "@#services,#mychan"
+}
+
+module
+{
+	name = "irc2sql"
+
+	/*
+	 * The name of the client that should send the CTCP VERSION requests.
+	 * It must already exist or must be defined in the following service block.
+	 */
+	client = "StatServ"
+
+	/* 
+	 * The name of the SQL engine to use.
+	 * This must be MySQL and must match the name in the mysql{} block
+	 */
+	engine = "mysql/main"
+
+	/*
+	 * An optional prefix to prepended to the name of each created table.
+	 * Do not use the same prefix for other programs.
+	 */
+	prefix = "anope_"
+
+	/*
+	 * GeoIP - Automatically adds users geoip location to the user table.
+	 * Tables are created by irc2sql, you have to run the
+	 * geoipupdate script after you started Anope to download
+	 * and import the GeoIP database.
+	 *
+	 * The geoip database can be the smaller "country" database or the
+	 * larger "city" database. Comment to disable geoip lookup.
+	 */
+	geoip_database = "country"
+
+	/*
+	 * Get the CTCP version from users
+	 * The users connecting to the network will receive a CTCP VERSION
+	 * request from the above configured services client
+	 */
+	ctcpuser = "yes"
+
+	/*
+	 * Send out CTCP VERSION requests to users during burst.
+	 * Disable this if you restart Anope often and don't want to
+	 * annoy your users.
+	 */
+	ctcpeob = "yes"
+}
+

data/memoserv.example.conf

@@ -4,12 +4,12 @@
 
 /*
  * First, create the service.
- * Note that an easy way to rename this service is to define{} the client name to something else.
  */
 service
 {
 	/*
 	 * The name of the MemoServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the memoserv module too.
 	 */
 	nick = "MemoServ"
 

data/modules.example.conf

@@ -4,6 +4,9 @@
  * The following blocks are used to load all non-core modules, including 3rd-party modules.
  * Modules can be prevented from loading by commenting out the line, other modules can be added by
  * adding a module block. These modules will be loaded prior to Services connecting to your network.
+ *
+ * Note that some of these modules are labeled EXTRA, and must be enabled prior to compiling by
+ * running the 'extras' script on Linux and UNIX.
  */
 
 /*
@@ -181,7 +184,7 @@ module { name = "help" }
 		/* Time before connections to this server are timed out. */
 		timeout = 30
 
-		/* Listen using SSL. Requires m_ssl. */
+		/* Listen using SSL. Requires an SSL module. */
 		#ssl = yes
 
 		/* If you are using a reverse proxy that sends one of the
@@ -197,7 +200,7 @@ module { name = "help" }
 }
 
 /*
- * m_ldap
+ * m_ldap [EXTRA]
  *
  * This module allows other modules to use LDAP. By itself, this module does nothing useful.
  */
@@ -219,7 +222,7 @@ module { name = "help" }
 }
 
 /*
- * m_ldap_authentication
+ * m_ldap_authentication [EXTRA]
  *
  * This module allows many commands such as IDENTIFY, RELEASE, RECOVER, GHOST, etc. use
  * LDAP to authenticate users. Requires m_ldap.
@@ -277,7 +280,7 @@ module { name = "help" }
 }
 
 /*
- * m_ldap_oper
+ * m_ldap_oper [EXTRA]
  *
  * This module dynamically ties users to Anope opertypes when they identify
  * via LDAP group membership. Requires m_ldap.
@@ -318,7 +321,7 @@ module { name = "help" }
 }
 
 /*
- * m_mysql
+ * m_mysql [EXTRA]
  *
  * This module allows other modules to use MySQL.
  */
@@ -337,6 +340,82 @@ module { name = "help" }
 		port = 3306
 	}
 }
+/*
+ * m_redis
+ *
+ * This module allows other modules to use Redis.
+ */
+#module
+{
+	name = "m_redis"
+
+	/* A redis database */
+	redis
+	{
+		/* The name of this service */
+		name = "redis/main"
+
+		/*
+		 * The redis database to use. New connections default to 0.
+		 */
+		db = 0
+
+		ip = "127.0.0.1"
+		port = 6379
+	}
+}
+
+/*
+ * m_regex_pcre [EXTRA]
+ *
+ * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
+ */
+#module { name = "m_regex_pcre" }
+
+/*
+ * m_regex_posix [EXTRA]
+ *
+ * Provides the regex engine regex/posix, which uses the POSIX compliant regular expressions.
+ * This is likely the only regex module you will not need extra libraries for.
+ */
+#module { name = "m_regex_posix" }
+
+/*
+ * m_regex_tre [EXTRA]
+ *
+ * Provides the regex engine regex/tre, which uses the TRE regex library.
+ */
+#module { name = "m_regex_tre" }
+
+/*
+ * m_rewrite
+ *
+ * Allows rewriting commands sent to/from clients.
+ */
+#module { name = "m_rewrite" }
+#command
+{
+	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
+
+	/* Enable m_rewrite. */
+	rewrite = true
+
+	/* Source message to match. A $ can be used to match anything. */
+	rewrite_source = "CLEAR $ USERS"
+
+	/*
+	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
+	 * replaced by the number-th word from the source_message, starting from 0.
+	 */
+	rewrite_target = "KICK $1 *"
+
+	/*
+	 * The command description. This only shows up in HELP's output.
+	 * Comment this option to prevent the command from showing in the
+	 * HELP command.
+	 */
+	rewrite_description = "Clears all users from a channel"
+}
 
 /*
  * m_proxyscan
@@ -421,7 +500,98 @@ module { name = "help" }
 }
 
 /*
- * m_sql_authentication
+ * m_sasl
+ *
+ * Some IRCds allow "SASL" authentication to let users identify to Services
+ * during the IRCd user registration process. If this module is loaded, Services will allow
+ * authenticating users through this mechanism. Supported mechanisms are:
+ * PLAIN, EXTERNAL.
+ */
+#module { name = "m_sasl" }
+
+/*
+ * m_sasl_dh-aes [EXTRA]
+ *
+ * Add the DH-AES mechanism to SASL.
+ * Requires m_sasl to be loaded.
+ * Requires openssl.
+ */
+#module { name = "m_sasl_dh-aes" }
+
+/*
+ * m_sasl_dh-blowfish [EXTRA]
+ *
+ * Add the DH-BLOWFISH mechanism to SASL.
+ * Requires m_sasl to be loaded.
+ * Requires openssl.
+ */
+#module { name = "m_sasl_dh-blowfish" }
+
+/*
+ * m_ssl_gnutls [EXTRA]
+ *
+ * This module provides SSL services to Anope using GnuTLS, for example to
+ * connect to the uplink server(s) via SSL.
+ *
+ * You may only load either m_ssl_gnutls or m_ssl_openssl, bot not both.
+ */
+#module
+{
+	name = "m_ssl_gnutls"
+
+	/*
+	 * An optional certificate and key for m_gnutls to give to the uplink.
+	 *
+	 * You can generate your own certificate and key pair by using:
+	 *
+	 *   certtool --generate-privkey --bits 2048 --outfile anope.key
+	 *   certtool --generate-self-signed --load-privkey anope.key --outfile anope.crt
+	 *
+	 */
+	cert = "data/anope.crt"
+	key = "data/anope.key"
+
+	/*
+	 * Diffie-Hellman parameters to use when acting as a server. This is only
+	 * required for TLS servers that want to use ephemeral DH cipher suites.
+	 *
+	 * This is NOT required for Anope to connect to the uplink server(s) via SSL.
+	 *
+	 * You can generate DH parameters by using:
+	 *
+	 *   certtool --generate-dh-params --bits 2048 --outfile dhparams.pem
+	 *
+	 */
+#	dhparams = "data/dhparams.pem"
+}
+
+/*
+ * m_ssl_openssl [EXTRA]
+ *
+ * This module provides SSL services to Anope using OpenSSL, for example to
+ * connect to the uplink server(s) via SSL.
+ *
+ * You may only load either m_ssl_openssl or m_ssl_gnutls, bot not both.
+ *
+ */
+#module
+{
+	name = "m_ssl_openssl"
+
+	/*
+	 * An optional certificate and key for m_openssl to give to the uplink.
+	 *
+	 * You can generate your own certificate and key pair by using:
+	 *
+	 *   openssl genrsa -out anope.key 2048
+	 *   openssl req -new -x509 -key anope.key -out anope.crt -days 1095
+	 */
+	cert = "data/anope.crt"
+	key = "data/anope.key"
+}
+
+/*
+ * m_sql_authentication [EXTRA]
  *
  * This module allows authenticating users against an external SQL database using a custom
  * query.
@@ -463,10 +633,16 @@ module { name = "help" }
 	 * If not set, then registration is not blocked.
 	 */
 	#disable_reason = "To register on this network visit http://some.misconfigured.site/register"
+
+	/*
+	 * If set, the reason to give the users who try to "/msg NickServ SET EMAIL".
+	 * If not set, then email changing is not blocked.
+	 */
+	#disable_email_reason = "To change your email address visit http://some.misconfigured.site"
 }
 
 /*
- * m_sql_log
+ * m_sql_log [EXTRA]
  *
  * This module adds an additional target option to log{} blocks
  * that allows logging Service's logs to SQL. To log to SQL, add
@@ -486,7 +662,7 @@ module { name = "help" }
 #module { name = "m_sql_log" }
 
 /*
- * m_sql_oper
+ * m_sql_oper [EXTRA]
  *
  * This module allows granting users services operator privileges and possibly IRC Operator
  * privileges based on an external SQL database using a custom query.
@@ -512,7 +688,7 @@ module { name = "help" }
 }
 
 /*
- * m_sqlite
+ * m_sqlite [EXTRA]
  *
  * This module allows other modules to use SQLite.
  */
@@ -531,126 +707,6 @@ module { name = "help" }
 	}
 }
 
-/*
- * m_redis
- *
- * This module allows other modules to use Redis.
- */
-#module
-{
-	name = "m_redis"
-
-	/* A redis database */
-	redis
-	{
-		/* The name of this service */
-		name = "redis/main"
-
-		/*
-		 * The redis database to use. New connections default to 0.
-		 */
-		db = 0
-
-		ip = "127.0.0.1"
-		port = 6379
-	}
-}
-
-/*
- * m_regex_pcre
- *
- * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
- */
-#module { name = "m_regex_pcre" }
-
-/*
- * m_regex_posix
- *
- * Provides the regex engine regex/posix, which uses the POSIX compliant regular expressions.
- * This is likely the only regex module you will not need extra libraries for.
- */
-#module { name = "m_regex_posix" }
-
-/*
- * m_regex_tre
- *
- * Provides the regex engine regex/tre, which uses the TRE regex library.
- */
-#module { name = "m_regex_tre" }
-
-/*
- * m_rewrite
- *
- * Allows rewriting commands sent to/from clients.
- */
-#module { name = "m_rewrite" }
-#command
-{
-	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
-
-	/* Enable m_rewrite. */
-	rewrite = true
-
-	/* Source message to match. A $ can be used to match anything. */
-	rewrite_source = "CLEAR $ USERS"
-
-	/*
-	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
-	 * replaced by the number-th word from the source_message, starting from 0.
-	 */
-	rewrite_target = "KICK $1 *"
-
-	/*
-	 * The command description. This only shows up in HELP's output.
-	 * Comment this option to prevent the command from showing in the
-	 * HELP command.
-	 */
-	rewrite_description = "Clears all users from a channel"
-}
-
-/*
- * m_ssl
- *
- * This module uses SSL to connect to the uplink server(s).
- */
-#module
-{
-	name = "m_ssl"
-
-	/*
-	 * An optional certificate and key for m_ssl to give to the uplink.
-	 *
-	 * You can generate your own certificate and key pair by using:
-	 *
-	 *   openssl genrsa -out anope.key 2048
-	 *   openssl req -new -x509 -key anope.key -out anope.crt -days 1095
-	 */
-	cert = "data/anope.crt"
-	key = "data/anope.key"
-}
-
-/*
- * m_xmlrpc
- *
- * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
- * By itself this module does nothing, but allows other modules (m_xmlrpc_main) to receive and send XMLRPC queries.
- */
-#module
-{
-	name = "m_xmlrpc"
-
-	/* Web service to use. Requires m_httpd. */
-	server = "httpd/main"
-}
-
-/*
- * m_xmlrpc_main
- *
- * Adds the main XMLRPC core functions.
- * Requires m_xmlrpc.
- */
-#module { name = "m_xmlrpc_main" }
-
 /*
  * webcpanel
  *
@@ -673,3 +729,25 @@ module { name = "help" }
 	/* Page title. */
 	title = "Anope IRC Services";
 }
+
+/*
+ * m_xmlrpc
+ *
+ * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
+ * By itself this module does nothing, but allows other modules (m_xmlrpc_main) to receive and send XMLRPC queries.
+ */
+#module
+{
+	name = "m_xmlrpc"
+
+	/* Web service to use. Requires m_httpd. */
+	server = "httpd/main"
+}
+
+/*
+ * m_xmlrpc_main
+ *
+ * Adds the main XMLRPC core functions.
+ * Requires m_xmlrpc.
+ */
+#module { name = "m_xmlrpc_main" }

data/nickserv.example.conf

@@ -4,12 +4,12 @@
 
 /*
  * First, create the service.
- * Note that an easy way to rename this service is to define{} the client name to something else.
  */
 service
 {
 	/*
 	 * The name of the NickServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the nickserv module too.
 	 */
 	nick = "NickServ"
 
@@ -174,6 +174,41 @@ module
 	 * This directive is optional.
 	 */
 	#restrictopernicks = yes
+
+	/*
+	 * The username, and possibly hostname, used for fake users created when Services needs to
+	 * hold a nickname.
+	 */
+	enforceruser = "enforcer"
+	enforcerhost = "services.host"
+
+	/*
+	 * The length of time Services hold nicknames.
+	 *
+	 * This directive is optional, but recommended. If not set it defaults to 1 minute.
+	 */
+	releasetimeout = 1m
+
+	/*
+	 * When a user's nick is forcibly changed to enforce a "nick kill", their new nick will start
+	 * with this value. The rest will be made up of 6 or 7 digits.
+	 * Make sure this is a valid nick and Nicklen+7 is not longer than the allowed Nicklen on your ircd.
+	 *
+	 * This directive is optional. If not set it defaults to "Guest"
+	 */
+	guestnickprefix = "Guest"
+
+	/*
+	 * If set, Services do not allow ownership of nick names, only ownership of accounts.
+	 */
+	nonicknameownership = no
+
+	/*
+	 * The maximum length of passwords
+	 *
+	 * This directive is optional. If not set it defaults to 32.
+	 */
+	passlen = 32
 }
 
 /*
@@ -214,6 +249,7 @@ module
 
 	/*
 	 * The maximum number of entries allowed on a nickname's access list.
+	 * If not set, the default is 32. This number cannot be set to 0.
 	 */
 	accessmax = 32
 
@@ -225,7 +261,6 @@ module
 	 */
 	addaccessonreg = yes
 }
-
 command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }
 
 /*
@@ -263,7 +298,16 @@ command { service = "NickServ"; name = "ALIST"; command = "nickserv/alist"; }
  *
  * Used for configuring your SSL certificate list, which can be used to automatically identify you.
  */
-module { name = "ns_cert"; accessmax = 5; }
+module
+{
+	name = "ns_cert"
+
+	/*
+	 * The maximum number of entries allowed on a nickname's certificate fingerprint list.
+	 * The default is 5. This number cannot be set to 0.
+	 */
+	max = 5
+}
 command { service = "NickServ"; name = "CERT"; command = "nickserv/cert"; }
 
 /*
@@ -317,13 +361,13 @@ module
 	maxaliases = 16
 
 	/*
-	 * If set, the NickServ GROUP command won't allow any group change. This is recommended for
-	 * better performance and to protect against nick stealing, however users will have less
-	 * flexibility.
+	 * If set, the NickServ GROUP command won't allow any group changes. This is recommended to
+	 * prevent users from accidentally dropping their nicks, as it forces users to explicitly
+	 * drop their nicks before adding it to another group.
 	 *
 	 * This directive is optional, but recommended.
 	 */
-	#nogroupchange = yes
+	nogroupchange = yes
 }
 command { service = "NickServ"; name = "GLIST"; command = "nickserv/glist"; }
 command { service = "NickServ"; name = "GROUP"; command = "nickserv/group"; }
@@ -354,6 +398,7 @@ command { service = "NickServ"; name = "INFO"; command = "nickserv/info"; }
 command { service = "NickServ"; name = "SET HIDE"; command = "nickserv/set/hide"; }
 command { service = "NickServ"; name = "SASET HIDE"; command = "nickserv/saset/hide"; permission = "nickserv/saset/hide"; }
 
+
 /*
  * ns_list
  *
@@ -371,11 +416,12 @@ module
 	 */
 	listmax = 50
 }
-command { service = "NickServ"; name = "LIST"; command = "nickserv/list"; group = "nickserv/admin"; }
+command { service = "NickServ"; name = "LIST"; command = "nickserv/list"; }
 
 command { service = "NickServ"; name = "SET PRIVATE"; command = "nickserv/set/private"; }
 command { service = "NickServ"; name = "SASET PRIVATE"; command = "nickserv/saset/private"; permission = "nickserv/saset/private"; }
 
+
 /*
  * ns_logout
  *
@@ -449,7 +495,6 @@ module
 	 */
 	#unconfirmedexpire = 1d
 }
-
 command { service = "NickServ"; name = "CONFIRM"; command = "nickserv/confirm"; }
 command { service = "NickServ"; name = "REGISTER"; command = "nickserv/register"; }
 command { service = "NickServ"; name = "RESEND"; command = "nickserv/resend"; }
@@ -492,7 +537,6 @@ module
 	#allowkillimmed = yes
 }
 
-
 command { service = "NickServ"; name = "SET"; command = "nickserv/set"; }
 command { service = "NickServ"; name = "SASET"; command = "nickserv/saset"; permission = "nickserv/saset/"; group = "nickserv/admin"; }
 
@@ -525,6 +569,7 @@ command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset
 
 command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; }
 
+
 /*
  * ns_set_misc
  *
@@ -571,7 +616,6 @@ module
 	 */
 	#suspendexpire = 90d
 }
-
 command { service = "NickServ"; name = "SUSPEND"; command = "nickserv/suspend"; permission = "nickserv/suspend"; group = "nickserv/admin"; }
 command { service = "NickServ"; name = "UNSUSPEND"; command = "nickserv/unsuspend"; permission = "nickserv/suspend"; group = "nickserv/admin"; }
 
@@ -596,7 +640,7 @@ command { service = "NickServ"; name = "UPDATE"; command = "nickserv/update"; }
  * Limits how many times the same email address may be used in Anope
  * to register accounts.
  */
-module
+#module
 {
 	name = "ns_maxemail"
 
@@ -605,5 +649,5 @@ module
 	 * commented, there will be no limit enforced when registering new accounts or using
 	 * /msg NickServ SET EMAIL.
 	 */
-	#maxemails = 1
+	maxemails = 1
 }

data/operserv.example.conf

@@ -4,12 +4,12 @@
 
 /*
  * First, create the service.
- * Note that an easy way to rename this service is to define{} the client name to something else.
  */
 service
 {
 	/*
 	 * The name of the OperServ client.
+	 * If you change this value, you probably want to change the client directive in the configuration for the operserv module too.
 	 */
 	nick = "OperServ"
 
@@ -488,11 +488,10 @@ module
 	/*
 	 * The number of LOGON/OPER news items to display when a user logs on.
 	 *
-	 * This directive is optional, if no set it will default to 3.
+	 * This directive is optional, if not set it will default to 3.
 	 */
 	#newscount = 3
 }
-
 command { service = "OperServ"; name = "LOGONNEWS"; command = "operserv/logonnews"; permission = "operserv/news"; }
 command { service = "OperServ"; name = "OPERNEWS"; command = "operserv/opernews"; permission = "operserv/news"; }
 command { service = "OperServ"; name = "RANDOMNEWS"; command = "operserv/randomnews"; permission = "operserv/news"; }
@@ -555,24 +554,24 @@ module
 	name = "os_session"
 
 	/*
-	 * Default session limit per host. Once a host reaches it's session limit, all clients attempting
+	 * Default session limit per host. Once a host reaches its session limit, all clients attempting
 	 * to connect from that host will be killed.
 	 *
-	 * This directive is require if os_session is loaded.
+	 * This directive is required if os_session is loaded.
 	 */
 	defaultsessionlimit = 3
 
 	/*
 	 * The maximum session limit that may be set for a host in an exception.
 	 *
-	 * This directive is require if os_session is loaded.
+	 * This directive is required if os_session is loaded.
 	 */
 	maxsessionlimit = 100
 
 	/*
 	 * Sets the default expiry time for session exceptions.
 	 *
-	 * This directive is require if os_session is loaded.
+	 * This directive is required if os_session is loaded.
 	 */
 	exceptionexpiry = 1d
 
@@ -643,7 +642,6 @@ module
 	 */
 	#superadmin = yes
 }
-
 command { service = "OperServ"; name = "SET"; command = "operserv/set"; permission = "operserv/set"; }
 
 /*

data/stats.standalone.example.conf

@@ -0,0 +1,513 @@
+/*
+ * Example configuration file for Services. After making the appropriate
+ * changes to this file, place it in the Services conf directory (as
+ * specified in the "configure" script, default /home/username/services/conf)
+ * under the name "services.conf".
+ *
+ * The format of this file is fairly simple: three types of comments are supported:
+ *  - All text after a '#' on a line is ignored, as in shell scripting
+ *  - All text after '//' on a line is ignored, as in C++
+ *  - A block of text like this one is ignored, as in C
+ *
+ * Outside of comments, there are three structures: blocks, keys, and values.
+ *
+ * A block is a named container, which contains a number of key to value pairs
+ * - you may think of this as an array.
+ *
+ * A block is created like so:
+ * foobar
+ * {
+ *    moo = "cow"
+ *    foo = bar
+ * }
+ *
+ * Note that nameless blocks are allowed and are often used with comments to allow
+ * easily commenting an entire block, for example:
+ * #foobar
+ * {
+ *    moo = "cow"
+ *    foo = bar
+ * }
+ * is an entirely commented block.
+ *
+ * Keys are case insensitive. Values depend on what key - generally, information is
+ * given in the key comment. The quoting of values (and most other syntax) is quite
+ * flexible, however, please do not forget to quote your strings:
+ *
+ *   "This is a parameter string with spaces in it"
+ *
+ * If you need to include a double quote inside a quoted string, precede it
+ * by a backslash:
+ *
+ *   "This string has \"double quotes\" in it"
+ *
+ * Time parameters can be specified either as an integer representing a
+ * number of seconds (e.g. "3600" = 1 hour), or as an integer with a unit
+ * specifier: "s" = seconds, "m" = minutes, "h" = hours, "d" = days.
+ * Combinations (such as "1h30m") are not permitted. Examples (all of which
+ * represent the same length of time, one day):
+ *
+ *   "86400", "86400s", "1440m", "24h", "1d"
+ *
+ * In the documentation for each directive, one of the following will be
+ * included to indicate whether an option is required:
+ *
+ * [REQUIRED]
+ *     Indicates a directive which must be given. Without it, Services will
+ *     not start.
+ *
+ * [RECOMMENDED]
+ *     Indicates a directive which may be omitted, but omitting it may cause
+ *     undesirable side effects.
+ *
+ * [OPTIONAL]
+ *     Indicates a directive which is optional. If not given, the feature
+ *     will typically be disabled. If this is not the case, more
+ *     information will be given in the documentation.
+ *
+ * [DISCOURAGED]
+ *     Indicates a directive which may cause undesirable side effects if
+ *     specified.
+ *
+ * [DEPRECATED]
+ *     Indicates a directive which will disappear in a future version of
+ *     Services, usually because its functionality has been either
+ *     superseded by that of other directives or incorporated into the main
+ *     program.
+ */
+
+/*
+ * [OPTIONAL] Defines
+ *
+ * You can define values to other values, which can be used to easily change
+ * many values in the configuration. at once.
+ */
+
+/*
+ * The services.host define is used in multiple different locations throughout the
+ * configuration for services clients hostnames.
+ */
+define
+{
+	name = "services.host"
+	value = "services.localhost.net"
+}
+
+/*
+ * [OPTIONAL] Additional Includes
+ *
+ * You can include additional configuration files here.
+ * You may also include executable files, which will be executed and
+ * the output from it will be included into your configuration.
+ */
+
+#include
+{
+	type = "file"
+	name = "some.conf"
+}
+
+#include
+{
+	type = "executable"
+	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+}
+
+/*
+ * [REQUIRED] IRCd Config
+ *
+ * This section is used to set up Anope to connect to your IRC network.
+ * This section can be included multiple times, and Anope will attempt to
+ * connect to each server until it finally connects.
+ *
+ * Each uplink IRCd should have a corresponding configuration to allow Services
+ * to link to it.
+ *
+ * An example configuration for InspIRCd that is compatible with the below uplink
+ * and serverinfo configuration would look like:
+ *
+ *     <link name="services.localhost.net"
+ *           ipaddr="127.0.0.1"
+ *           port="7000"
+ *           sendpass="mypassword"
+ *           recvpass="mypassword">
+ *     <uline server="services.localhost.net" silent="yes">
+ *     <bind address="127.0.0.1" port="7000" type="servers">
+ *
+ * An example configuration for UnrealIRCd that is compatible with the below uplink
+ * and serverinfo configuration would look like:
+ *
+ *     link services.localhost.net
+ *     {
+ *          username *;
+ *          hostname *;
+ *          bind-ip "127.0.0.1";
+ *          port 7000;
+ *          hub *;
+ *          password-connect "mypassword";
+ *          password-receive "mypassword";
+ *          class servers;
+ *     };
+ *     ulines { services.localhost.net; };
+ *     listen 127.0.0.1:7000;
+ */
+uplink
+{
+	/*
+	 * The IP or hostname of the IRC server you wish to connect Services to.
+	 * Usually, you will want to connect Services over 127.0.0.1 (aka localhost).
+	 *
+	 * NOTE: On some shell providers, this will not be an option.
+	 */
+	host = "127.0.0.1"
+
+	/*
+	 * Enable if Services should connect using IPv6.
+	 */
+	ipv6 = no
+
+	/*
+	 * Enable if Services should connect using SSL.
+	 * You must have an SSL module loaded for this to work.
+	 */
+	ssl = no
+
+	/*
+	 * The port to connect to.
+	 * The IRCd *MUST* be configured to listen on this port, and to accept
+	 * server connections.
+	 *
+	 * Refer to your IRCd documentation for how this is to be done.
+	 */
+	port = 7000
+
+	/*
+	 * The password to send to the IRC server for authentication.
+	 * This must match the link block on your IRCd.
+	 *
+	 * Refer to your IRCd documentation for more information on link blocks.
+	 */
+	password = "mypassword"
+}
+
+/*
+ * [REQUIRED] Server Information
+ *
+ * This section contains information about the Services server.
+ */
+serverinfo
+{
+	/*
+	 * The hostname that Services will be seen as, it must have no conflicts with any
+	 * other server names on the rest of your IRC network. Note that it does not have
+	 * to be an existing hostname, just one that isn't on your network already.
+	 */
+	name = "stats.localhost.net"
+
+	/*
+	 * The text which should appear as the server's information in /whois and similar
+	 * queries.
+	 */
+	description = "Stats for IRC Networks"
+
+	/*
+	 * The local address that Services will bind to before connecting to the remote
+	 * server. This may be useful for multihomed hosts. If omitted, Services will let
+	 * the Operating System choose the local address. This directive is optional.
+	 *
+	 * If you don't know what this means or don't need to use it, just leave this
+	 * directive commented out.
+	 */
+	#localhost = "nowhere."
+
+	/*
+	 * What Server ID to use for this connection?
+	 * Note: This should *ONLY* be used for TS6/P10 IRCds. Refer to your IRCd documentation
+	 * to see if this is needed.
+	 */
+	#id = "00A"
+
+	/*
+	 * The filename containing the Services process ID. The path is relative to the
+	 * services root directory.
+	 */
+	pid = "data/services.pid"
+
+	/*
+	 * The filename containing the Message of the Day. The path is relative to the
+	 * services root directory.
+	 */
+	motd = "conf/services.motd"
+}
+
+/*
+ * [REQUIRED] Protocol module
+ *
+ * This directive tells Anope which IRCd Protocol to speak when connecting.
+ * You MUST modify this to match the IRCd you run.
+ *
+ * Supported:
+ *  - bahamut
+ *  - charybdis
+ *  - hybrid
+ *  - inspircd12
+ *  - inspircd20
+ *  - ngircd
+ *  - plexus
+ *  - ratbox
+ *  - unreal
+ */
+module
+{
+	name = "inspircd20"
+}
+
+/*
+ * [REQUIRED] Network Information
+ *
+ * This section contains information about the IRC network that Services will be
+ * connecting to.
+ */
+networkinfo
+{
+	/*
+	 * This is the name of the network that Services will be running on.
+	 */
+	networkname = "LocalNet"
+
+	/*
+	 * Set this to the maximum allowed nick length on your network.
+	 * Be sure to set this correctly, as setting this wrong can result in
+	 * Services being disconnected from the network.
+	 */
+	nicklen = 31
+
+	/* Set this to the maximum allowed ident length on your network.
+	 * Be sure to set this correctly, as setting this wrong can result in
+	 * Services being disconnected from the network.
+	 */
+	userlen = 10
+
+	/* Set this to the maximum allowed hostname length on your network.
+	 * Be sure to set this correctly, as setting this wrong can result in
+	 * Services being disconnected from the network.
+	 */
+	hostlen = 64
+
+	/* Set this to the maximum allowed channel length on your network.
+	 */
+	chanlen = 32
+
+	/* The maximum number of list modes settable on a channel (such as b, e, I).
+	 * Comment out or set to 0 to disable.
+	 */
+	modelistsize = 100
+
+	/*
+	 * The characters allowed in hostnames. This is used for validating hostnames given
+	 * to services, such as BotServ bot hostnames and user vhosts. Changing this is not
+	 * recommended unless you know for sure your IRCd supports whatever characters you are
+	 * wanting to use. Telling services to set a vHost containing characters your IRCd
+	 * disallows could potentially break the IRCd and/or Services.
+	 *
+	 * It is recommended you DON'T change this.
+	 */
+	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
+
+	/*
+	 * If set to true, allows vHosts to not contain dots (.).
+	 * Newer IRCds generally do not have a problem with this, but the same warning as
+	 * vhost_chars applies.
+	 *
+	 * It is recommended you DON'T change this.
+	 */
+	allow_undotted_vhosts = false
+
+	/*
+	 * The characters that are not allowed to be at the very beginning or very ending
+	 * of a vHost. The same warning as vhost_chars applies.
+	 *
+	 * It is recommended you DON'T change this.
+	 */
+	disallow_start_or_end = ".-"
+}
+
+/*
+ * [REQUIRED] Services Options
+ *
+ * This section contains various options which determine how Services will operate.
+ */
+options
+{
+	/*
+	 * On Linux/UNIX systems Anope can setuid and setgid to this user and group
+	 * after starting up. This is useful if Anope has to bind to privileged ports
+	 */
+	#user = "anope"
+	#group = "anope"
+
+	/*
+	 * The case mapping used by services. This must be set to a valid locale name
+	 * installed on your machine. Services use this case map to compare, with
+	 * case insensitivity, things such as nick names, channel names, etc.
+	 *
+	 * We provide two special casemaps shipped with Anope, ascii and rfc1459.
+	 *
+	 * This value should be set to what your IRCd uses, which is probably rfc1459,
+	 * however Anope has always used ascii for comparison, so the default is ascii.
+	 *
+	 * Changing this value once set is not recommended.
+	 */
+	casemap = "ascii"
+
+	/*
+	 * Sets the timeout period for reading from the uplink.
+	 */
+	readtimeout = 5s
+
+	/*
+	 * Sets the interval between sending warning messages for program errors via
+	 * WALLOPS/GLOBOPS.
+	 */
+	warningtimeout = 4h
+
+	/*
+	 * If set, Services will only show /stats o to IRC Operators. This directive
+	 * is optional.
+	 */
+	#hidestatso = yes
+
+	/*
+	 * A space-separated list of ulined servers on your network, it is assumed that
+	 * the servers in this list are allowed to set channel modes and Services will
+	 * not attempt to reverse their mode changes.
+	 *
+	 * WARNING: Do NOT put your normal IRC user servers in this directive.
+	 *
+	 * This directive is optional.
+	 */
+	#ulineservers = "services.your.network"
+
+	/*
+	 * How long to wait between connection retries with the uplink(s).
+	 */
+	retrywait = 60s
+}
+
+/*
+ * [RECOMMENDED] Logging Configuration
+ *
+ * This section is used for configuring what is logged and where it is logged to.
+ * You may have multiple log blocks if you wish. Remember to properly secure any
+ * channels you choose to have Anope log to!
+ */
+log
+{
+	/*
+	 * Target(s) to log to, which may be one of the following:
+	 *   - a channel name
+	 *   - a filename
+	 *   - globops
+	 */
+	target = "stats.log"
+
+	/* Log to both services.log and the channel #services
+	 *
+	 * Note that some older IRCds, such as Ratbox, require services to be in the
+	 * log channel to be able to message it. To do this, configure service:channels to
+	 * join your logging channel.
+	 */
+	#target = "stats.log #services"
+
+	/*
+	 * The source(s) to only accept log messages from. Leave commented to allow all sources.
+	 * This can be a users name, a channel name, one of our clients (eg, OperServ), or a server name.
+	 */
+	#source = ""
+
+	/*
+	 * The bot used to log generic messages which have no predefined sender if there
+	 * is a channel in the target directive.
+	 */
+	bot = "Global"
+
+	/*
+	 * The number of days to keep logfiles, only useful if you are logging to a file.
+	 * Set to 0 to never delete old logfiles.
+	 *
+	 * Note that Anope must run 24 hours a day for this feature to work correctly.
+	 */
+	logage = 7
+
+	/*
+	 * What types of log messages should be logged by this block. There are nine general categories:
+	 *
+	 *  servers    - Server actions, linking, squitting, etc.
+	 *  channels   - Actions in channels such as joins, parts, kicks, etc.
+	 *  users      - User actions such as connecting, disconnecting, changing name, etc.
+	 *  other      - All other messages without a category.
+	 *  rawio      - Logs raw input and output from services
+	 *  debug      - Debug messages (log files can become VERY large from this).
+	 *
+	 * These options determine what messages from the categories should be logged. Wildcards are accepted, and
+	 * you can also negate values with a ~. For example, "~operserv/akill operserv/*" would log all operserv
+	 * messages except for operserv/akill. Note that processing stops at the first matching option, which
+	 * means "* ~operserv/*" would log everything because * matches everything.
+	 *
+	 * Valid server options are:
+	 *    connect, quit, sync, squit
+	 *
+	 * Valid channel options are:
+	 *    create, destroy, join, part, kick, leave, mode
+	 *
+	 * Valid user options are:
+	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers, oper
+	 *
+	 * Rawio and debug are simple yes/no answers, there are no types for them.
+	 *
+	 * Note that modules may add their own values to these options.
+	 */
+	servers = "*"
+	#channels = "~mode *"
+	users = "connect disconnect nick"
+	other = "*"
+	rawio = no
+	debug = no
+}
+
+/*
+ * [REQUIRED] MySQL Database configuration.
+ *
+ * m_mysql
+ *
+ * This module allows other modules to use MySQL.
+ */
+module
+{
+	name = "m_mysql"
+
+	mysql
+	{
+		/* The name of this service. */
+		name = "mysql/main"
+		database = "anope"
+		server = "127.0.0.1"
+		username = "anope"
+		password = "mypassword"
+		port = 3306
+	}
+}
+
+/*
+ * IRC2SQL Gateway
+ * This module collects data about users, channels and servers. It doesn't build stats
+ * itself, however, it gives you the database, it's up to you how you use it.
+ *
+ * Requires a MySQL Database and MySQL version 5.5 or higher
+ */
+include
+{
+	type = "file"
+	name = "irc2sql.example.conf"
+}
+

data/version.log

@@ -1,4 +1,334 @@
-Revision e3e0da3 - Sat, 12 Oct 2013 15:11:09 -0400 - Update language files
+Revision cdf636e - Sun, 23 Mar 2014 08:57:08 -0400 - Regen langauge files
+Revision 45878bf - Sat, 22 Mar 2014 21:14:02 +0100 - SASL: Also disallow suspended nicks to login using EXTERNAL mechanism. Improve the log message for failed logins.
+Revision f1bec39 - Sat, 22 Mar 2014 07:21:22 -0400 - Do not allow SASL login to suspended nicks
+Revision a259244 - Thu, 20 Mar 2014 10:53:27 -0400 - Make bouncymodes harder to trigger by only bumping server modcount when something changes
+Revision c1da009 - Wed, 19 Mar 2014 02:40:48 -0400 - Show a better log message when disconnecting from the uplink
+Revision 4f412bc - Wed, 19 Mar 2014 03:05:54 +0100 - cs_set_misc: Add missing override capability for services operators, and logging.
+Revision 1882916 - Mon, 17 Mar 2014 01:15:28 +0100 - Update the dutch language file.
+Revision f436ce9 - Mon, 17 Mar 2014 00:58:51 +0100 - m_ssl_gnutls: Fix deprecation warnings when using newer GnuTLS versions.
+Revision ef9729f - Fri, 14 Mar 2014 22:13:04 -0400 - Mark all channels as syncing when we connect to our uplink. They will finish syncing later when the uplink syncs. Normally the channel state is fully synced here anyway, except if we do not know the modes the uplink has yet.
+Revision 296a75f - Thu, 13 Mar 2014 20:07:50 -0400 - Do not allow users to add certs that other users are using. Only allow adding certfps if the user is using it.
+Revision bce7237 - Tue, 11 Mar 2014 09:45:34 -0400 - Set LDAP_OPT_NETWORK_TIMEOUT to 0 in m_ldap to prevent the asynchronous library cals from blocking...
+Revision 85834e1 - Mon, 10 Mar 2014 22:30:41 +0100 - Update the dutch language file. ns_maxemail: Bold code 2 -> 002.
+Revision ca6b372 - Mon, 10 Mar 2014 07:32:24 -0400 - Merge pull request #64 from ShutterQuick/2.0+hsgroupsync
+Revision 23b1086 - Mon, 10 Mar 2014 07:31:34 -0400 - Merge pull request #63 from alexbarton/ngircd-fix-KILL
+Revision 860deb1 - Mon, 10 Mar 2014 07:26:09 -0400 - Do not send unregistered notice to users who are logged in, even if their nick isn't registered
+Revision 62885fa - Mon, 10 Mar 2014 05:04:25 -0400 - Set nickserv's modesonid on login too
+Revision 3fef01e - Mon, 10 Mar 2014 04:56:17 -0400 - Fix compile error in m_sasl_dh-aes and m_sasl_dh-blowfish on unusually old g++ versions
+Revision b0597e3 - Mon, 10 Mar 2014 04:31:08 -0400 - Do not allow nickserv/ungroup to bypass ns_maxemail, and allow opers to bypass ns_maxemail
+Revision 8d1ad6f - Sun, 9 Mar 2014 22:59:16 -0400 - Make nickserv/glist show the correct expire time for unconfirmed nicks
+Revision 7505692 - Sun, 9 Mar 2014 22:56:25 -0400 - Add missing space to session exception expiration message
+Revision 1a1a781 - Sun, 9 Mar 2014 10:07:13 -0400 - Remove mail:restrict as it is no longer useful. Changes nickserv/resetpass default to allow normal users to use it.
+Revision 4b5ce8a - Sun, 9 Mar 2014 04:55:35 +0100 - irc2sql: removed the currentusers field from the chan table, keeping it updated on each join/part eats too many ressources
+Revision 98cfdd2 - Thu, 6 Mar 2014 04:55:30 -0800 - ns_group: Don't require a nick param when logged in
+Revision 051a42b - Thu, 6 Mar 2014 04:55:30 -0800 - hs_group: Allow automatic HS GROUP-ing on NS GROUP, and allow vhosts to be per account rather than nick.
+Revision 220e278 - Wed, 5 Mar 2014 20:23:44 -0500 - Open database files using std::ios_base::binary in db_flatfile, which Windows can require
+Revision 547fe0d - Wed, 5 Mar 2014 10:26:54 +0100 - ngircd protocol module: really kill users
+Revision 09bec79 - Tue, 4 Mar 2014 04:15:32 -0500 - Fix 2 crashes from removing the permanent channel mode from channels which do not exist
+Revision 55a5aff - Tue, 4 Mar 2014 04:15:32 -0500 - Do not allow guest nicks to exceed nicklen, and use a default enforcer ident/host if none is provided
+Revision a8b4297 - Mon, 3 Mar 2014 19:20:56 +0100 - Update the dutch language file.
+Revision 5969362 - Sat, 1 Mar 2014 22:41:45 -0500 - When unserializing channels with persist, set their ts=now. If we are supposed to lower it later we will then.
+Revision 3ceae33 - Sat, 1 Mar 2014 21:56:26 -0500 - Convert limit and key mlocks in db_old
+Revision 5de4c1f - Sat, 1 Mar 2014 21:40:47 -0500 - Set +x on plexus when vhosts are activated, fix desync from /hs off
+Revision fd10904 - Sat, 1 Mar 2014 21:20:32 -0500 - Make db_old load entrymsg
+Revision a074751 - Sat, 1 Mar 2014 21:20:18 -0500 - Export interface for cs_entrymsg
+Revision 605e1f2 - Sat, 1 Mar 2014 21:12:27 -0500 - Make chanserv/invite show who invited you
+Revision dc23c58 - Sat, 1 Mar 2014 21:11:58 -0500 - Fix botserv help to show the correct fantasy characters
+Revision b7e646e - Sat, 1 Mar 2014 20:02:17 -0500 - Allow opers with chanserv/administration to use fantasy, even if they don't have the access for it
+Revision 4d54358 - Sat, 1 Mar 2014 19:59:40 -0500 - When unserializating channels and persist is set, only assign chanserv if the perm channel mode doesnt exist
+Revision ed0882e - Sat, 1 Mar 2014 18:39:10 -0500 - Do not enforce mlock when enforcing mlock
+Revision 526c4e4 - Sat, 1 Mar 2014 18:38:14 -0500 - Check modes after applying mlocks in db_old
+Revision b70f72b - Sat, 1 Mar 2014 04:31:52 -0500 - Do not allow changing the email of unconfirmed accounts
+Revision 2ad4c19 - Sat, 1 Mar 2014 04:27:45 -0500 - Fix incorrect comment in modules.example.conf
+Revision 049760c - Fri, 28 Feb 2014 00:30:35 -0500 - Allow svsjoin/svspart on yourself
+Revision e2ecec3 - Thu, 27 Feb 2014 23:21:50 -0500 - Hybrid does not let us add resvs as a server, but the core expects to be able to qline bot nicks before introducing the bots as a way to prevent collisions, so try harder to find a valid bot to send resvs on startup
+Revision fee016b - Thu, 27 Feb 2014 22:42:54 -0500 - Handle nick collisions somewhat instead of blindly overwriting the nicks in memory, which does weird things.
+Revision d24fb03 - Thu, 27 Feb 2014 04:49:28 -0500 - Allow registration=mail forceemail=false to work, and simply give fully registered accounts to people who do not provide an email to nickserv/register
+Revision 5adc8bf - Thu, 27 Feb 2014 04:48:48 -0500 - Do not take modes from users in channels with secureops off if we are always lowering channels timestamps to their creations
+Revision abcf0cd - Wed, 26 Feb 2014 19:32:25 -0500 - Remove unreachable code in config.cpp, this error is caught earlier
+Revision 8f3bd31 - Wed, 26 Feb 2014 19:26:50 -0500 - Fix not detecting eols in the config reader when the end of the line is the end of a multiline comment
+Revision e2d456d - Wed, 26 Feb 2014 19:24:32 -0500 - Do not setuid/gid down until after modules are loaded
+Revision 96202ae - Mon, 24 Feb 2014 22:23:12 -0500 - Log successful SASL auths
+Revision 2b0229d - Tue, 25 Feb 2014 03:22:55 +0100 - Update the italian language file
+Revision beaa319 - Mon, 24 Feb 2014 16:14:40 -0500 - Update Spanish translation, from Isaac Fontal <i_fontal@hotmail.com>
+Revision b6d771a - Mon, 24 Feb 2014 00:31:07 -0500 - Anope 2.0.0-rc4 Release
+Revision d3ed756 - Mon, 24 Feb 2014 00:30:57 -0500 - Update version.log (why do we keep this around?)
+Revision f830884 - Mon, 24 Feb 2014 00:30:47 -0500 - Package dlls in src/win32 on Windows
+Revision 1dfdf36 - Mon, 24 Feb 2014 00:06:38 -0500 - Fix m_ssl_gnutls to send its cert. Most of this is from Attila.
+Revision 4ac3ade - Sun, 23 Feb 2014 23:08:35 -0500 - Use a more reliable way to detect if services are running in anoperc
+Revision 212abeb - Sun, 23 Feb 2014 23:42:43 +0100 - webcpanel: Update copyright year. ns_cert: Bold code 2 -> 002.
+Revision 7d4427c - Sun, 23 Feb 2014 05:24:06 +0100 - Regenerated language files.
+Revision e836be4 - Sat, 22 Feb 2014 17:46:00 -0500 - Store a cert->account map and use it for SASL EXTERNAL and certfp auth
+Revision 1db5c55 - Sat, 22 Feb 2014 13:46:36 -0500 - Merge pull request #58 from attilamolnar/2.0+gnutlsdep
+Revision bb1b015 - Sat, 22 Feb 2014 16:59:10 +0100 - Make m_ssl_gnutls work with at least GnuTLS v2.8
+Revision e42684a - Sat, 22 Feb 2014 16:40:56 +0100 - Update italian translation, from Simos.
+Revision d7de7ee - Sat, 22 Feb 2014 15:58:36 +0100 - Italian language completed translation, first release
+Revision 0a390ad - Sat, 22 Feb 2014 15:56:34 +0100 - Regenerated language files, and updated dutch language file.
+Revision aa6b12c - Fri, 21 Feb 2014 21:54:01 -0500 - Fix Windows build
+Revision e2bd08f - Fri, 21 Feb 2014 20:50:23 -0500 - Add some missing serial updates in os_dns
+Revision 2047934 - Fri, 21 Feb 2014 19:57:31 -0500 - Regenerate Italian language file
+Revision e07dcbf - Fri, 21 Feb 2014 19:57:31 -0500 - Update italian translation, from Simos
+Revision e3a8a45 - Fri, 21 Feb 2014 19:49:29 -0500 - Merge pull request #56 from ShutterQuick/2.0+noxcrypt
+Revision f1ad7fd - Fri, 21 Feb 2014 20:41:41 +0000 - fix comment, activate not active
+Revision 43f2645 - Thu, 20 Feb 2014 20:07:38 +0000 - update help info
+Revision b6935e7 - Thu, 20 Feb 2014 11:42:20 -0800 - enc_bcrypt.cpp: Get rid of the libxcrypt dependency by including code from libxcrypt, and move enc_bcrypt out of extras
+Revision a3c8458 - Thu, 20 Feb 2014 17:11:11 +0000 - Updated services crontab location
+Revision 5933a5e - Tue, 18 Feb 2014 22:24:24 +0000 - Merge remote branch 'upstream/2.0' into 2.0
+Revision 109d8f4 - Tue, 18 Feb 2014 13:04:16 -0500 - Do not import forbids with wildcards in their names, how 1.8 treats wildcaded forbids depends on the IRCd
+Revision 1edb7e7 - Tue, 18 Feb 2014 12:59:37 -0500 - Merge pull request #54 from attilamolnar/2.0+webcpanelfix
+Revision 928e2e1 - Tue, 18 Feb 2014 12:57:31 -0500 - Fix loading noexpire channels in db_old
+Revision 5a140e4 - Tue, 18 Feb 2014 12:54:22 -0500 - Merge pull request #55 from attilamolnar/2.0+alphabet
+Revision f643939 - Tue, 18 Feb 2014 13:00:46 +0100 - Alphabetically order modules in modules.example.conf ('r' < 's' and 'w' < 'x')
+Revision 0db81ca - Mon, 17 Feb 2014 22:21:08 -0500 - Merge pull request #52 from attilamolnar/2.0+gnutls
+Revision 7f7144d - Mon, 17 Feb 2014 22:20:38 -0500 - Merge pull request #53 from attilamolnar/2.0+reuseaddrfix
+Revision 3883716 - Tue, 18 Feb 2014 03:28:02 +0100 - Turn BinarySocket::Write() into a no-op when called with l == 0
+Revision 5beea4e - Tue, 18 Feb 2014 03:27:12 +0100 - Fix TemplateFileServer writing empty messages resulting in zero length DataBlocks being created and later passed to SocketIO::Send()
+Revision 2d0fdb7 - Tue, 18 Feb 2014 02:31:01 +0100 - Fix setsockopt() with SO_REUSEADDR not working due to wrong argument type
+Revision 80588fb - Mon, 17 Feb 2014 19:43:19 -0500 - Fix os_ignore to work correctly with SQL
+Revision ef7dc94 - Mon, 17 Feb 2014 19:39:25 -0500 - Move most of the implementation details out of os_forbid.h, fixes crashing if a module adding a forbid is unloaded without removing the forbid
+Revision 7b4eec9 - Mon, 17 Feb 2014 13:53:45 -0500 - Remove docs/IRCD, it is very outdated and no longer correct at all
+Revision baff417 - Mon, 17 Feb 2014 13:53:04 -0500 - Move encryption.h to include/modules
+Revision 7074944 - Mon, 17 Feb 2014 13:39:49 -0500 - Fix not applying ipv[46]_cidr to connecting clients in os_session, #1573
+Revision 1c39d25 - Mon, 17 Feb 2014 01:12:01 +0100 - Add m_ssl_gnutls
+Revision f1c5c27 - Sun, 16 Feb 2014 23:49:57 +0000 - Merge branch '2.0', remote branch 'upstream/2.0' into 2.0
+Revision 9c0134e - Mon, 17 Feb 2014 00:41:36 +0100 - Rename m_ssl to m_ssl_openssl and update docs
+Revision 959fee5 - Sun, 16 Feb 2014 18:28:39 -0500 - Fix Windows build
+Revision 3854a55 - Sun, 16 Feb 2014 16:07:36 -0500 - Merge pull request #51 from ShutterQuick/2.0+oldforbid
+Revision ab1e0eb - Sun, 16 Feb 2014 12:56:27 -0800 - db_old.cpp: Correctly import forbidden nicks and chans
+Revision cffe864 - Sun, 16 Feb 2014 14:10:25 -0500 - Merge pull request #50 from ShutterQuick/bcrypt
+Revision bc15753 - Sun, 16 Feb 2014 11:07:37 -0800 - modules.example.conf: Update examples for bcrypt - also clearify that m_sasl_dh* requires openssl
+Revision a71d0f6 - Sun, 16 Feb 2014 11:07:36 -0800 - enc_bcrypt: Add module
+Revision 50d7bf7 - Fri, 14 Feb 2014 19:15:43 -0500 - Merge pull request #48 from ShutterQuick/2.0+nnghsasl
+Revision d44bcef - Fri, 14 Feb 2014 16:06:24 -0800 - modules.example.conf: Add info about m_sasl_dh-aes and m_sasl_dh-blowfish
+Revision c0ce71e - Fri, 14 Feb 2014 15:12:25 -0800 - m_sasl_dh-blowfish: Add module
+Revision 0eeb0ca - Fri, 14 Feb 2014 15:12:25 -0800 - m_sasl_dh-aes: Add module
+Revision b13bded - Fri, 14 Feb 2014 15:03:42 -0800 - sasl.h, m_sasl.cpp: Move IdentifyRequest to the header
+Revision 1b1180f - Fri, 14 Feb 2014 13:42:21 -0800 - base64.cpp: B64Decode(): Don't crash on "="
+Revision a4ecfa5 - Fri, 14 Feb 2014 13:05:01 -0800 - Anope::string: Add .data()
+Revision 3c8009b - Fri, 14 Feb 2014 13:05:01 -0800 - sasl.h, m_sasl.cpp: Add RemoveSession(), DeleteSessions(), and have active sessions closed when a Mechanism is unloaded
+Revision ca85df2 - Fri, 14 Feb 2014 11:10:20 -0500 - Don't convert XOP access entries to levels in db_old
+Revision 5dfa659 - Fri, 14 Feb 2014 11:09:53 -0500 - Do not sync channels in Channel::Reset if they are in the middle of syncing, and checkmodes in Channel::Sync. Fixes channel modes sometimes not being set if always_lower_ts is on
+Revision f428d61 - Thu, 13 Feb 2014 19:42:02 -0500 - Use better command access checking in webpanel for operserv/akill
+Revision fc50edf - Wed, 12 Feb 2014 14:49:22 -0500 - Disable m_sasl by default
+Revision 269c278 - Wed, 12 Feb 2014 14:39:41 -0500 - Add SASL EXTERNAL support. Thanks to ShutterQuick for fixing and testing.
+Revision 96fc940 - Tue, 11 Feb 2014 19:25:44 -0500 - Only trim newlines and carriage returns in BufferedSocket::GetLine
+Revision 8c8e6d4 - Tue, 11 Feb 2014 18:08:09 -0500 - Make initial registration notices with mail less repetitive
+Revision 22976b8 - Tue, 11 Feb 2014 17:33:28 -0500 - Fix flags +* or -* sometimes incorrectly reporting opers as overriding when they are not
+Revision 4dff710 - Tue, 11 Feb 2014 03:57:15 +0100 - ns_suspend: Show the setter of the suspension and the reason when manually unsuspending.
+Revision fe80d2c - Tue, 11 Feb 2014 02:26:00 +0100 - os_modinfo: Add ability to list only extra modules.
+Revision 16dac87 - Mon, 10 Feb 2014 10:03:38 -0500 - Regenerate anope.it_IT.po
+Revision 30c5956 - Mon, 10 Feb 2014 09:57:24 -0500 - Update Italian language translation
+Revision 6d61a84 - Sun, 9 Feb 2014 18:51:52 -0500 - Add an opertype priv "protected" to not allow services to kick a user. Also classify ulines as protected
+Revision f6b8596 - Sun, 9 Feb 2014 10:59:36 -0500 - Log memoserv/sendall
+Revision da6760f - Fri, 7 Feb 2014 13:28:07 -0500 - Properly convert suspended nicks and channels in db_old
+Revision ad962ad - Fri, 7 Feb 2014 13:12:57 -0500 - Allow other modules to suspend nicknames and channels without having to subclass suspendinfo
+Revision 5327bec - Fri, 7 Feb 2014 13:02:20 -0500 - Allow other modules to be able to view and modify cs and ns set_misc data
+Revision f43c99c - Fri, 7 Feb 2014 12:12:52 -0500 - Merge pull request #46 from ShutterQuick/patch-1
+Revision c0a491c - Fri, 7 Feb 2014 18:04:16 +0100 - Update cs_updown.cpp
+Revision 66cc965 - Wed, 5 Feb 2014 15:26:03 -0500 - Ignore nonblocking errnors on socket operations
+Revision 2440514 - Wed, 5 Feb 2014 08:46:56 -0500 - Document a little more accurrately the privilege stuff and document why the access lists behave as they do
+Revision fad1da8 - Wed, 5 Feb 2014 08:46:56 -0500 - Process mode changes in ns_ajoin before joining users, fixes not being able to ajoin users to +R channels on Unreal
+Revision bb0e2a9 - Wed, 5 Feb 2014 08:46:51 -0500 - Make it easier to use fantasy without botserv, and document it
+Revision 4f8c4f8 - Mon, 3 Feb 2014 10:05:13 -0500 - Actually just allow mode clear to take any mode name
+Revision 2595711 - Mon, 3 Feb 2014 08:41:27 -0500 - Fix typo in mode clear, exempts -> excepts
+Revision 9a88953 - Sun, 2 Feb 2014 03:21:02 -0500 - Apply the last commit to cs_list
+Revision 53f8db0 - Sat, 1 Feb 2014 11:42:08 -0800 - Merge pull request #44 from ShutterQuick/2.0+listfix
+Revision f94cb7f - Sat, 1 Feb 2014 11:24:52 -0800 - ns_list: Fix typo (NS_SUSPENDED -> SUSPENDED)
+Revision c30fb13 - Sat, 1 Feb 2014 11:12:39 -0800 - Merge pull request #43 from ShutterQuick/2.0+ajoinfix
+Revision 7926238 - Sat, 1 Feb 2014 10:55:12 -0800 - Improve IsChannelValid()
+Revision 211a944 - Sat, 1 Feb 2014 10:35:10 -0800 - ns_ajoin: Treat ',' as a separator.
+Revision cff6161 - Sat, 1 Feb 2014 10:31:17 -0800 - commasepstream: Add a allowempty param
+Revision 4455d43 - Fri, 31 Jan 2014 02:43:26 -0800 - Merge pull request #42 from ShutterQuick/2.0+saslfix
+Revision 405b41e - Fri, 31 Jan 2014 01:41:27 -0800 - protocol/(inspircd12/unreal/charybdis): Have SASL login in on the account name instead of nick alias
+Revision bacb276 - Tue, 28 Jan 2014 14:45:21 -0500 - Use TBURST on hybrid to set topics
+Revision 4c1f6b4 - Sun, 26 Jan 2014 16:08:23 -0800 - Merge pull request #40 from attilamolnar/2.0+csclonefix
+Revision 53a78c2 - Sun, 26 Jan 2014 20:06:36 +0100 - Fix cs_clone allowing users to clone a channel to itself
+Revision e61a283 - Sun, 26 Jan 2014 16:33:28 +0100 - Update language files.
+Revision c330219 - Sun, 26 Jan 2014 01:18:38 -0500 - Anope 2.0.0-rc3 Release
+Revision cd18459 - Sun, 26 Jan 2014 01:17:58 -0500 - Only have extras rerun config if it was successfully run before. Config can create the build directory even if cmake isn't found.
+Revision f28b114 - Sun, 26 Jan 2014 01:15:19 -0500 - Correct error message in gl_global to reference the right module
+Revision 87230c1 - Sun, 26 Jan 2014 01:14:58 -0500 - Fix extra space in the unknown command error message
+Revision a29b789 - Sun, 26 Jan 2014 01:14:28 -0500 - Use the SQLine reason in the kick reason for sqlined channels
+Revision e965bc3 - Sun, 26 Jan 2014 01:03:43 -0500 - Revert "Rename db_old hash plain -> none which is what 1.8 calls it"
+Revision 01780c9 - Sat, 25 Jan 2014 17:58:20 -0500 - Fix setname handler on unreal
+Revision 4d3363f - Tue, 21 Jan 2014 21:55:59 -0500 - Anope 2.0.0-rc2 Release
+Revision 75e27b6 - Tue, 21 Jan 2014 21:55:59 -0500 - Update version.log
+Revision fbaca3f - Tue, 21 Jan 2014 21:55:56 -0500 - Update language files
+Revision 81b01bb - Tue, 21 Jan 2014 21:10:06 -0500 - Fix missing colon in stats and top, fix smileys and actions count. Patch by bush.
+Revision 1027ec6 - Tue, 21 Jan 2014 17:33:57 -0500 - Made the chanstats confs try and look similar to every other configuration file
+Revision 4d9273e - Tue, 21 Jan 2014 17:20:15 -0500 - Unbreak account stuff from commit ccae59430ab50393f43ccc38a6a6c0c24191b601.
+Revision 67c13b4 - Tue, 21 Jan 2014 00:29:59 +0100 - Update and fix some more typos in the dutch language file.
+Revision 10386a3 - Tue, 21 Jan 2014 00:28:40 +0100 - Make the server connected (uplink) message more sane.
+Revision dc19ea3 - Mon, 20 Jan 2014 02:19:06 -0500 - Alias charybdis/uid -> ratbox/uid because grawity is weird
+Revision 2261fa3 - Mon, 20 Jan 2014 00:05:53 -0500 - Fix example config for bs_autoassign
+Revision fab9f0f - Sun, 19 Jan 2014 19:03:19 -0500 - Change config readers bool logic to accept unrecognized values as yes
+Revision df8d85d - Sun, 19 Jan 2014 08:11:19 +0100 - m_chanstats: fixed the config options NSDefChanstats and CSDefChanstats
+Revision 4b192ad - Fri, 17 Jan 2014 06:49:49 +0100 - m_chanstats: do not count negative words if you have more smileys in a line than words
+Revision d27594f - Wed, 15 Jan 2014 16:59:32 -0500 - Fix webcpanels chanserv/modes page
+Revision 43aaaea - Tue, 14 Jan 2014 03:50:08 -0500 - Mark m_sql_log, m_rewrite, and m_dnsbl as extra so they show up in modlist with no parameters, as they are "unusual"
+Revision ccae594 - Tue, 14 Jan 2014 03:49:22 -0500 - Call User::Login after sending the login event, in case a module wants to act on the fact that the ircd sees  the user as logged in
+Revision 974adb7 - Sun, 12 Jan 2014 17:44:14 -0500 - Update French language file
+Revision f3531e7 - Fri, 10 Jan 2014 01:41:03 -0500 - Fix not initializing module in the main log constructor
+Revision 15a27c6 - Thu, 9 Jan 2014 17:01:18 -0500 - Move oper count and vhost stuff to set/remove mode internal
+Revision 0b0db75 - Thu, 9 Jan 2014 16:45:07 -0500 - Fix repeat kicker message to show the correct number of times a user can say the same thing before being kicked
+Revision b90a9a3 - Thu, 9 Jan 2014 16:09:38 -0500 - Fix empty ttb in bs kick repeat on
+Revision 64f9aed - Thu, 9 Jan 2014 15:46:04 -0500 - Hook to OnUserLogin instead of OnNickIdentify in ns_ajoin
+Revision 56f2cbe - Thu, 9 Jan 2014 15:44:58 -0500 - Remove help access levels from help output because it no longer exists
+Revision 9a9ca41 - Thu, 9 Jan 2014 15:42:31 -0500 - Rename db_old hash plain -> none which is what 1.8 calls it
+Revision e19661e - Thu, 9 Jan 2014 15:41:49 -0500 - Make DNSBL log message use the module type and give it a category too
+Revision 09879c5 - Mon, 6 Jan 2014 13:59:14 -0500 - Fix compile with -std=c++11
+Revision 12f55e4 - Mon, 6 Jan 2014 12:54:29 -0500 - Hide +s channels from /cs list output to non opers
+Revision 43c5654 - Mon, 6 Jan 2014 00:19:19 -0500 - Add a small note about the extras script in docs/INSTALL
+Revision d307885 - Sun, 5 Jan 2014 15:39:09 -0800 - Merge pull request #39 from DanielOaks/cs-status-channelname
+Revision d4f7db1 - Mon, 6 Jan 2014 09:37:08 +1000 - Add the channel name to reply of cs-status, useful for applications
+Revision 201ad9c - Sat, 4 Jan 2014 17:54:04 -0500 - Always run uid/sid generation loop at least once to not reuse older ids immediately
+Revision 45c0bf8 - Sat, 4 Jan 2014 17:45:58 -0500 - Fix recovering enforcers not properly quitting them
+Revision d64855b - Sat, 4 Jan 2014 13:44:47 -0500 - Allow m_sql_authentication to disable email changing similar to m_ldap_authentication
+Revision 4617fdb - Sat, 4 Jan 2014 13:41:08 -0500 - Make /cs status use the chanserv/auspex privilege instead of chanserv/access/modify, as it only views channel access
+Revision ac20474 - Sat, 4 Jan 2014 12:24:04 -0500 - Also make m_sql_authentication block nick grouping if it is disabling registration
+Revision e1ce617 - Fri, 3 Jan 2014 19:54:14 -0500 - Move modules/stats under extras because it depends on m_mysql, update its config a bit to look similar to all of the other config files
+Revision 2781b69 - Thu, 2 Jan 2014 11:44:18 -0500 - Add an explicit privilege for os_config's modify
+Revision 1e502c8 - Thu, 2 Jan 2014 11:41:49 -0500 - Update os_config
+Revision 004c4cb - Thu, 2 Jan 2014 11:03:33 -0500 - Move modules out of extras that dont have external dependencies
+Revision 072202c - Thu, 2 Jan 2014 10:56:57 -0500 - Have db_old load news.db too
+Revision 595dad4 - Wed, 1 Jan 2014 20:48:38 -0500 - Update copyright to 2014. This was done with: find include/ src/ lang/ docs/ modules/ *.* Config -exec sed -i 's/-20.. Anope Team/-2014 Anope Team/i' {} \;
+Revision a374e24 - Wed, 1 Jan 2014 16:21:38 -0500 - Make inspircds module class names not conflict because it confuses OSX
+Revision 6e6543d - Tue, 31 Dec 2013 16:12:21 -0500 - I don't think this OnBotKick to hold channels is necessary anymore as Sync should cover everything now, and this causes weird things when the last user in a channel kicks themselves out using the bot. Also handle users rejoining a channel while its held better.
+Revision 6124af6 - Tue, 31 Dec 2013 15:31:56 -0500 - Show the command name and not service name in the access denied log messages
+Revision f21b40b - Mon, 30 Dec 2013 10:50:15 -0500 - Set last_realname in m_ldap_authentication when new nicks are registered
+Revision 567700b - Mon, 30 Dec 2013 10:42:07 -0500 - Also have m_ldap_authentication disable nick grouping if registration is disabled
+Revision 3b80da9 - Mon, 30 Dec 2013 10:34:57 -0500 - Fix loading kicker ttb data
+Revision c519119 - Sun, 29 Dec 2013 05:27:36 +0100 - Don't expire ignores when NoExpire is enabled.
+Revision 780bc7c - Sat, 28 Dec 2013 23:28:30 +0100 - Do not translate command parameters that do not have translatable strings in them, or are not meant to be translated in the first place.
+Revision 3d12752 - Sat, 28 Dec 2013 09:39:16 -0500 - Fix naming collision between modes +g and +G on inspircd, rename the common badwords censor mode to censor
+Revision 9c0ceed - Fri, 27 Dec 2013 17:24:52 -0500 - Readd channel description to ns alist output
+Revision 187973c - Fri, 27 Dec 2013 17:20:47 -0500 - Allow inverting opertype privs and commands, to make them behave like the log settings
+Revision 072631a - Fri, 27 Dec 2013 17:15:07 -0500 - Fix forbid add message to show the correct type
+Revision b638b65 - Fri, 27 Dec 2013 17:12:01 -0500 - Fix crash when channels are registered that do not exist by non users
+Revision 0fb2b60 - Thu, 26 Dec 2013 21:06:26 -0500 - Fix xmlrpc dochannel example
+Revision 16f3f0c - Thu, 26 Dec 2013 21:06:07 -0500 - Don't leak ldap results
+Revision b28db7b - Thu, 26 Dec 2013 17:33:06 -0500 - Fix crash with badwords of type 'end' and possibly when messages contain only control codes. Also fix matching single words at the beginning of lines.
+Revision 9bf9cfc - Thu, 26 Dec 2013 16:08:56 -0500 - If using db_flatfile:fork, don't allow multiple saves to happen at one time on shutdown/restart wait for any pending saves to finish
+Revision 0c9750a - Thu, 26 Dec 2013 15:19:48 -0500 - Default the founder privilege to level 10000 as I had originally intended. Document set fonder usage in cs_levels help.
+Revision 69c5aec - Thu, 26 Dec 2013 19:44:41 +0100 - updated the extras script to find the cmake binary installed by ./Config
+Revision 59c3c13 - Thu, 26 Dec 2013 18:46:20 +0100 - m_chanstats: 1) fixed the SASET message 2) decreased the size of some VARCHAR fields, this hopefully fixes the 'key too long' error on some systems.
+Revision 5829d7d - Thu, 26 Dec 2013 12:06:39 -0500 - Add a config option for whether or not to reset the TS of persistent channels to their registration date
+Revision 2f29c13 - Thu, 26 Dec 2013 11:39:35 -0500 - Fix not setting the persist flag on newly registered channels when the permanent channel mode is set prior to registering or during registration
+Revision fc0e826 - Thu, 26 Dec 2013 08:02:19 -0500 - Fix dropping channels in the webpanel
+Revision 19eccf0 - Wed, 25 Dec 2013 15:16:04 -0500 - Fix setting english language in db_old, document how not setting defaultlanguage really works
+Revision dbf5106 - Wed, 25 Dec 2013 14:29:41 -0500 - Fix sqline on hybrid
+Revision 3029a2d - Tue, 24 Dec 2013 20:58:06 -0500 - Don't epxire forbids when noexpire mode is on
+Revision 53df61b - Tue, 24 Dec 2013 20:48:09 -0500 - Make webcpanel's nickserv alist behave more like /ns alist
+Revision 7d27689 - Tue, 24 Dec 2013 20:20:47 -0500 - Set a description for the resend command
+Revision 421e194 - Tue, 24 Dec 2013 18:19:44 -0500 - If last usermask and last realhost are the same, don't show both because duh
+Revision c442bc1 - Sun, 22 Dec 2013 08:37:49 -0500 - Do not allow /cs clone access to add duplicate masks to the access list or allow growing the list pass accessmax. Fix reading botservs case sensitive config option. Give a better error message when trying to clone badwords if there is no botserv.
+Revision 1c02961 - Fri, 20 Dec 2013 22:57:58 -0500 - Anope 2.0.0-rc1 Release
+Revision 268d529 - Fri, 20 Dec 2013 22:57:56 -0500 - Update version.log
+Revision 4bc4b98 - Fri, 20 Dec 2013 22:56:38 -0500 - Regenerate language files
+Revision e8b4260 - Fri, 20 Dec 2013 22:56:34 -0500 - Update Changes and Changes.conf
+Revision e792865 - Fri, 20 Dec 2013 20:24:40 -0500 - Fix reading unconfirmed expire config value when register type is set to mail
+Revision 2b5a1d8 - Fri, 20 Dec 2013 19:48:20 -0500 - Fix deleting multiple access entries when one of them matches your access group
+Revision 7cf2134 - Fri, 20 Dec 2013 12:18:44 -0800 - Merge pull request #33 from Robby-/1.9-nllangupdate
+Revision ba8a646 - Fri, 20 Dec 2013 14:57:06 -0500 - Add missing syntax to botserv kicker help
+Revision fa50252 - Fri, 20 Dec 2013 20:15:30 +0100 - Update the dutch language file for new and modified strings, and fix some more typos while we're at it.
+Revision 46bb2de - Fri, 20 Dec 2013 02:28:35 -0500 - Document hs reject's reason
+Revision c2e9b80 - Fri, 20 Dec 2013 07:34:49 +0100 - Revert "m_chanstats: changed the default value of some fields to NULL instead of ''"
+Revision c0cd76a - Thu, 19 Dec 2013 21:34:21 -0500 - Don't leak opers and opertypes on /os reload, fix not updating opertypes on non conf opers on rehash
+Revision ab6cd3b - Thu, 19 Dec 2013 20:35:09 -0500 - Fix a few commands not being able to find non conf opers
+Revision 275f2fd - Thu, 19 Dec 2013 08:24:21 -0500 - Fix db_old assigning empty greets to users who did not have a greet. Fix debug log message in extensible.cpp
+Revision c4d4107 - Thu, 19 Dec 2013 07:32:46 -0500 - Channel::Sync can delete the channel, so safely iterate them when syncing from a server burst
+Revision ae5da11 - Thu, 19 Dec 2013 07:16:17 +0100 - irc2sql: fixed not storing ssl information on inspircd
+Revision e6544a0 - Tue, 17 Dec 2013 11:02:06 -0500 - Update last_modes when keepmodes is set on or off
+Revision 1ab7d53 - Tue, 17 Dec 2013 10:58:02 -0500 - Set pending mode changes immediately when an object is removed from the mode stacker. And fix mlock creator from cs set persist on.
+Revision d709c81 - Mon, 16 Dec 2013 12:50:49 -0500 - Default build type to release
+Revision 2ad4a86 - Sun, 15 Dec 2013 16:52:08 +0100 - irc2sql: fixed small typo
+Revision 6ff83c3 - Sun, 15 Dec 2013 16:24:22 +0100 - m_chanstats: changed the default value of some fields to NULL instead of ''
+Revision adbc5a0 - Sat, 14 Dec 2013 09:56:51 +0100 - irc2sql: improved handling of netsplits
+Revision f9a4a0f - Fri, 13 Dec 2013 18:41:01 -0500 - Log all admin commands by default. I was trying to give an example of log settings, but people seem to leave the default and then get confused when it only logs operserv commands
+Revision a282a5c - Tue, 10 Dec 2013 20:17:29 -0500 - Fix 96af354ad55e439be71b82077dd6a411b4746bbb to not burst topics if they are not set
+Revision 3ddfa2f - Tue, 10 Dec 2013 20:15:34 -0500 - Explain how to setup the locales on Ubuntu
+Revision 50f430f - Mon, 9 Dec 2013 21:18:01 -0500 - Document which modules are extra and how to enable them
+Revision 1b4d62e - Mon, 9 Dec 2013 05:57:36 +0100 - irc2sql: fixed incorrect usercount for channels and servers after netsplit, fixed not displaying the channelmodes
+Revision 43f608f - Tue, 3 Dec 2013 23:58:57 -0800 - Merge pull request #32 from Harak/1.9
+Revision f0313a4 - Tue, 3 Dec 2013 22:09:06 +0100 - Updated french installation instructions.
+Revision 96af354 - Mon, 2 Dec 2013 02:01:39 -0500 - Send channel topics on initial burst, sync chanels after db load, and try to after unserializing persist on
+Revision b5966cf - Sun, 1 Dec 2013 21:16:50 -0500 - Fix crash from loading exceptions with db_old and then unloading db_old
+Revision faab2c6 - Sun, 1 Dec 2013 18:58:20 -0500 - Fix 5e4d52ad4717fb07dde629902beb70c252c8c8b4 more
+Revision c6f85b9 - Sun, 1 Dec 2013 12:09:34 +0100 - made the chanstats fantasy modules work again.
+Revision 5e4d52a - Sun, 1 Dec 2013 05:00:28 -0500 - Fix 1542937d64860243dcf410738ee73f433a661a94
+Revision 6628e71 - Sat, 30 Nov 2013 02:18:20 -0500 - Require email address to be passed to resetpass
+Revision 0f9e931 - Sun, 24 Nov 2013 22:00:01 -0500 - Revert "Fix session user logoff hook"
+Revision 1f6385c - Sun, 24 Nov 2013 14:11:52 -0800 - Merge pull request #29 from Robby-/1.9-nllangupdate
+Revision be044c9 - Sun, 24 Nov 2013 22:04:27 +0100 - Update the dutch language file for new and modified strings, and fix some typos while we're at it.
+Revision 90aa576 - Sat, 23 Nov 2013 22:12:33 -0500 - Fix/clean/clarify some stuff found by coverity scan
+Revision 77e5744 - Fri, 22 Nov 2013 01:22:24 +0100 - fixed webcpanel not html escaping displayed memos, bug reported by Mietzie
+Revision e1264a5 - Thu, 21 Nov 2013 18:06:38 -0500 - Re-find dependant protocol modules on unload, they can be reloaded from under us while we are running
+Revision 18f4232 - Thu, 21 Nov 2013 17:38:54 -0500 - This actually can't happen, but this is what was meant
+Revision c967a4c - Thu, 21 Nov 2013 17:31:18 -0500 - Shrink nick and channel default flags in db_old, otherwise converted nicks/channels always end up with the defaults enabled, even if they explicitly have them set off. Fix setting nickserv defaults to none.
+Revision 1542937 - Thu, 21 Nov 2013 11:34:42 -0500 - Hybrid has no quit on kill, so internally kill users when killed
+Revision 3b8f1cd - Thu, 21 Nov 2013 11:20:10 -0500 - Fix session user logoff hook
+Revision fbbdedf - Wed, 20 Nov 2013 18:10:26 -0500 - OnJoinChannel can modify the ts for a channel, so update keep_their_modes in the sjoin handler before processing a user. Otherwise we can desync and think users have a channel status when they really don't.
+Revision b75faef - Tue, 19 Nov 2013 10:06:22 -0500 - Don't claim to support SAVE on charybdis...
+Revision 676db0b - Mon, 18 Nov 2013 18:36:37 -0500 - Actually we can use this ssl ext type which apparently does exist
+Revision b2802d0 - Mon, 18 Nov 2013 17:18:00 -0500 - Give a reason why we cant clear nonssl users on ircds with no ssl usermode
+Revision 826ae9b - Mon, 18 Nov 2013 17:18:00 -0500 - Make /ms check better able to tell if youve recently sent a memo to someone
+Revision 2c3e8a7 - Mon, 18 Nov 2013 17:18:00 -0500 - Check override permission in cs_flags for modifying existing entries too
+Revision 0bb23f3 - Mon, 18 Nov 2013 07:53:45 -0800 - Merge pull request #27 from Cronus89/patch-1
+Revision b364981 - Mon, 18 Nov 2013 07:53:36 -0800 - Merge pull request #28 from Robby-/1.9+cslevels
+Revision f6cf978 - Mon, 18 Nov 2013 10:52:28 -0500 - Show the correct setting name in /ns help set message
+Revision aeebaed - Mon, 18 Nov 2013 10:49:54 -0500 - Default adding to 1 in mlock add/del, always reply with something even if the input is invalid
+Revision faabff0 - Mon, 18 Nov 2013 07:17:40 +0100 - cs_access: Fixed disabling channel levels. Also, correctly log /cs levels commands as an override or a normal command at the time it is executed, so, right before levels actually get modified.
+Revision cba811b - Sun, 17 Nov 2013 23:35:57 -0500 - Default nogroupchange to on, update comment to make sense
+Revision dcae3d7 - Sun, 17 Nov 2013 19:37:19 -0600 - Fix placeholder for akill.html
+Revision fc69b68 - Sat, 16 Nov 2013 16:38:10 -0500 - Don't default /cs list or /ns list to require oper privs
+Revision 15e527f - Sat, 16 Nov 2013 15:14:15 -0500 - Add missing .founder checks to cs_flags
+Revision 3ccf26f - Sat, 16 Nov 2013 14:55:03 -0500 - Delete notify/client sockets when m_dns is unloaded
+Revision c0b0ee1 - Sat, 16 Nov 2013 13:33:20 -0500 - Make /cs up set modes you have the priv for, but not the auto priv, because Robby says so
+Revision b353e1d - Sat, 16 Nov 2013 12:05:20 -0500 - Also check command names in cs_log when seeing if a newly added entry already exists. Also force command names lowercase when looking them up.
+Revision 3edce88 - Sat, 16 Nov 2013 10:39:25 -0500 - Fix default level names for access change/list in db_old
+Revision 9e1fb11 - Sat, 16 Nov 2013 10:22:18 -0500 - Tell people why they cant disable the founder level instead of claiming it doesn't exist
+Revision 316c280 - Sat, 16 Nov 2013 10:20:35 -0500 - Add help for /cs set keepmodes
+Revision cc2a999 - Sat, 16 Nov 2013 10:04:26 -0500 - Allow founders to change flags even if they don't have any matching access entries on the channel
+Revision 51a9f64 - Sat, 16 Nov 2013 09:38:13 -0500 - Use the source's sync state and not mine when processing sjoins to determine whether or not to sync the channel on creation, instead sync it when the server syncs.
+Revision 332fd23 - Fri, 15 Nov 2013 15:10:23 -0500 - Add general:hideregisteredcommands to hide commands that require you to be identified to use. This changes the behavior of hideprivilegedcommands to only hide commands users don't have the oper privileges to execute.
+Revision 1aca292 - Fri, 15 Nov 2013 14:24:33 -0500 - Allow mlocking +r on ratbox/whatever else
+Revision b65fd34 - Tue, 12 Nov 2013 20:12:56 -0500 - Set the default db name to anope.db
+Revision c9f4c2d - Tue, 12 Nov 2013 19:19:21 -0500 - try/catch cs_access AccessUnserialize just incase, don't crash if ns_ajoin is loaded before the protocol module
+Revision d1248d1 - Sat, 9 Nov 2013 05:40:58 -0800 - Merge pull request #25 from Robby-/1.9-nsidfaillogacctnames
+Revision afc5c91 - Sat, 9 Nov 2013 05:51:38 -0500 - Do not grant auto privileges to founders if they match other access entries. This allows channel founders to disable auto +qo without having to globally disable autoop or the levels.
+Revision aa6c3f3 - Sat, 9 Nov 2013 05:47:14 -0500 - Show (none) on flags list if a user is on the access list but has no flags
+Revision 2a35151 - Sat, 9 Nov 2013 05:41:10 -0500 - Remove db_plain
+Revision fa7cee9 - Fri, 8 Nov 2013 17:47:13 -0500 - Don't allow users to remove non-flags access entries that are >= them with /cs flags, also spotted by TGS
+Revision 431b2e6 - Mon, 4 Nov 2013 21:44:08 -0800 - Merge pull request #26 from Cronus89/patch-1
+Revision 853e926 - Mon, 4 Nov 2013 15:05:10 -0800 - Merge pull request #23 from Phr33d0m/1.9
+Revision 8267407 - Mon, 4 Nov 2013 23:59:55 +0100 - Add a couple of usability and aesthetic changes, fix the half-broken chanlist functionality, add a couple of missing ESCAPED_CHANNEL vars
+Revision a831e5d - Sun, 3 Nov 2013 21:41:01 -0600 - CREATE EVENT chanstats_event_cleanup_weekly failed due to calculating improper start of week.
+Revision b901dfe - Mon, 4 Nov 2013 02:59:16 +0100 - ns_identify: When logging failures, also show the account name, and that it exists or not.
+Revision 6e8d2bf - Fri, 1 Nov 2013 05:19:48 -0400 - Attempt #3
+Revision 70e9b20 - Fri, 1 Nov 2013 05:12:30 -0400 - Fix release build, not too sure why this is, compiler seems to infer this as a copy of ChanAccess
+Revision 4ee9021 - Fri, 1 Nov 2013 04:58:38 -0400 - Compare access entries created with the levels access system by access level and not by privilege set, as two entries can have the same privset but different levels, but still represent two different levels of access. This prevented users from adding other users at a lower access level when that level had the same privset as them. Spotted by TSG.
+Revision c8db362 - Fri, 1 Nov 2013 04:56:17 -0400 - Cleanup some access(group) comparison logic in access.cpp
+Revision c710625 - Fri, 1 Nov 2013 02:07:35 -0400 - Use Config::GetClient for looking up services for command{} blocks which lessens the insanity of renaming services
+Revision ac2f8bf - Fri, 1 Nov 2013 02:04:21 -0400 - People often seem to get tripped up by this, so document more clearly
+Revision 04e7fa4 - Fri, 1 Nov 2013 02:04:21 -0400 - Don't take modes in SetCorrectModes if the user has the ME privilege
+Revision f7692ec - Mon, 28 Oct 2013 01:37:47 -0700 - Merge pull request #24 from Robby-/1.9+fixes
+Revision 4a1d32c - Mon, 28 Oct 2013 09:30:56 +0100 - Fix logging when identifying with an SSL certificate fingerprint.
+Revision 498da95 - Mon, 28 Oct 2013 09:30:20 +0100 - Stop requesting identification when changing nicks to a registered nick, and the current client certificate fingerprint matches one on the nickname's list.
+Revision 710d484 - Mon, 28 Oct 2013 09:25:17 +0100 - Fix kill and killquick default expiry times. ns_access and ns_cert: Fix accessmax defaults, also state in the config that 0 is not a valid value.
+Revision bd3bed2 - Mon, 28 Oct 2013 09:13:53 +0100 - Fix some typos and touch up the configs a little.
+Revision fe31b0a - Sun, 27 Oct 2013 20:33:37 -0400 - Fix m_httpd not passing non post data to other modules correctly & close connections immediately when we are done flushing data
+Revision 1f97d6d - Sun, 27 Oct 2013 18:10:15 +0100 - fixed a small error that causes irc2sql to not compile
+Revision 4bd5649 - Sun, 27 Oct 2013 04:53:57 +0100 - fixed make install not installing the new example config files
+Revision b5af310 - Sat, 26 Oct 2013 18:42:58 +0200 - added the irc2sql gateway module
+Revision 2cfc970 - Sat, 26 Oct 2013 18:33:07 +0200 - moved some config options from example.conf to nickserv.example.conf
+Revision 6cde65a - Sat, 26 Oct 2013 18:33:07 +0200 - new event OnSetDisplayedHost
+Revision 7cb35ee - Tue, 22 Oct 2013 03:44:06 -0400 - Make nickserv's confirmemailchanges option work
+Revision f0318fd - Sat, 19 Oct 2013 03:43:04 -0400 - Fix some typos of language
+Revision 93a83da - Sat, 19 Oct 2013 03:42:12 -0400 - Fix os_dns not using remove_split_servers and fix remove_split_servers=true readd_connected_servers=false causing delinked servers to remaing in pooled+not active state
+Revision 0ff1bb9 - Mon, 14 Oct 2013 01:19:42 -0400 - Bump for 1.9.10-git
+Revision c0dea5e - Sat, 12 Oct 2013 15:28:49 -0400 - Anope 1.9.9 Release
+Revision fd4ac7f - Sat, 12 Oct 2013 15:28:49 -0400 - Update version.log
+Revision e635f54 - Sat, 12 Oct 2013 15:28:48 -0400 - Update language files
 Revision 7167cff - Sat, 12 Oct 2013 15:05:42 -0400 - Update changes and changes.conf sort of
 Revision b844154 - Thu, 10 Oct 2013 18:12:48 +0200 - fixed a typo in the last commit, reported by Robby
 Revision 5e56dfd - Thu, 10 Oct 2013 07:51:35 +0200 - replaced the country name in the Language header in the language files by four letter codes

docs/Changes

@@ -1,3 +1,7 @@
+Anope Version 2.0.0
+-------------------
+Added irc2sql stats module
+
 Anope Version 1.9.9
 --------------------
 A Added a better webpanel template, removed the old one

docs/Changes.conf

@@ -1,3 +1,10 @@
+Anope Version 2.0.0
+-------------------
+options:passlen, enforceruser, enforcerhost, releasetimeout, and guestnickprefix moved to nickserv's module configuration
+options:hideregisteredcommands added
+m_ssl renamed to m_ssl_openssl
+mail:restrict removed
+
 Anope Version 1.9.9
 -------------------
 There is not many config changes betewen 1.9.8 and 1.9.9, however many of the

docs/INSTALL

@@ -44,6 +44,10 @@ Note: You should also read the README and FAQ files!
     Next, unpack the package in your home directory, and go into the created
     directory.
 
+    If there are any extra modules you want to enable, such as m_mysql, run
+    the 'extras' script to enable them. If you do not know you can come back
+    later and enable them.
+
     Now type ./Config to start the configuration script. It will ask you a
     few questions, and figure out how to compile Anope on your system. If
     you are unsure about the answer to a question, use the default value.
@@ -63,20 +67,17 @@ Note: You should also read the README and FAQ files!
     cause trouble on your network if passwords are not encrypted, or read
     the memos of any user.
 
-    If you see errors during this process, please mail us with the *complete*
-    error output, and don't forget to mention your OS, compiler and C++ library
-    versions.
-
-    Now go into the data directory (by default, ~/services/data). Copy the example
+    Now go into the conf directory (by default, ~/services/conf). Copy the example
     configuration file (example.conf) to services.conf, and open the latter
     with your favorite text editor. It contains all the configuration
     directives Anope will use at startup. Read the instructions contained in
     the file carefully. Using the default values is NOT a good idea, and will
     most likely not work!
 
-    If you need help, you should subscribe to the Anope mailing list and mail
-    there to get help from other users. See the README file for more
-    information.
+    If you need help, you should visit http://forum.anope.org/ or #anope on
+    irc.anope.org. Provide *complete* error output, along with other relevant 
+    information eg. OS, compiler and C++ library versions.
+    See the README file for more information.
 
 2) Upgrading Anope
 
@@ -130,7 +131,7 @@ Note: You should also read the README and FAQ files!
     still running, and restart it if not.
 
     First rename the example.chk script that is in Anope path (by default,
-    this is ~/services/data) to services.chk and edit it. You'll need to 
+    this is ~/services/conf) to services.chk and edit it. You'll need to 
     modify the CONFIGURATION part of the file. Then ensure that the file is 
     marked as executable by typing chmod +x services.chk, and try to launch the
     script to see if it works (Anope must not be running when you do this ;))
@@ -139,7 +140,7 @@ Note: You should also read the README and FAQ files!
     This will open the default text editor with the crontab file. Enter the
     following (with correct path):
 
-        */5 * * * * /home/ircd/services/data/services.chk >/dev/null 2>&1
+        */5 * * * * /home/ircd/services/conf/services.chk >/dev/null 2>&1
 
     The */5 at the beginning means "check every 5 minutes". You may replace
     the 5 with other another number if you want (but less than 60). Consult

docs/INSTALL.fr

@@ -1,209 +1,158 @@
-Installation et instructions d'anope
+Instructions d'installation d'Anope
 ------------------------------------
 
-1) Instalation d'anope
-2) Mise à jour d'anope
-3) Configuration de l'ircd
-4) Mise en route de anope
-5) Mise en place d'un fichier crontab
+1) Installation d'Anope
+2) Mettre à jour Anope
+3) Configuration de l'IRCd
+4) Mettre en route Anope
+5) Mettre en place un crontab
 
-Note: Vous devrez également lire les fichiers README et FAQ !
+Note : Vous devrez également lire les fichiers README et FAQ !
 
-1) Installation de anope
+1) Installation d'Anope
 
-      Note importante: il n'est pas recommandé d'utiliser (et même d'installer)
-                     Anope en tant que root.
-                     Utilisez un utilisateur non privilégié,
+    NOTE IMPORTANTE : il n'est pas recommandé d'utiliser (et même d'installer)
+                     Anope en tant que root. Utilisez un utilisateur non 
+		     privilégié. Celui que vous utilisez pour l'IRCd ou un
+		     utilisateur dédié suffira.
 
+    La première chose que vous devez faire est d'obtenir le package Anope (si ce 
+    n'est déjà fait). Vous pouvez le trouver ici :
 
-La première chose que vous devez faire est d'obtenir le package Anope (si ce n'est déjà fait).
+         http://www.anope.org/
 
-Vous pouvez le trouver ici  http://www.anope.org/
+    Anope peut être installé de deux façons. La méthode recommandée est 
+    d'utiliser CMake. Vous pouvez vérifier si CMake est déjà installé 
+    sur votre système en utilisant la commande :
 
+        cmake --version
 
+    Si CMake est installé, vous aurez une ligne qui dit quelque chose similaire 
+    à "cmake version 2.6 cmake-patch 1". Si la version est inférieure à 2.4 ou 
+    si vous obtenez une erreur disant que la commande n'a pas été trouvée, 
+    vous ne serez pas en mesure d'utiliser CMake, sauf si vous l'installez 
+    vous-même dans votre répertoire home. CMake peut être téléchargé ici : 
 
-Anope peut être installer de deux façons.
+        http://www.cmake.org/cmake/resources/software.html
 
- 1.  La méthode recommandée est d'utiliser CMake.
-     Vous pouvez vérifier si CMake est déjà installé sur votre système en utilisant la
+    Si vous n'arrivez pas à l'installer (soit en raison du manque d'espace
+    ou de restrictions par votre fournisseur d'hébergement), vous pouvez encore
+    utiliser le script de configuration fourni. Cette option n'est pas 
+    recommandée et finira par être retirée, mais est fournie pour la 
+    compatibilité de ceux à qui il manque CMake.
 
-     commande:  cmake --version ( sur votre vps ou dedier etre loggué en root )
+    Ensuite, décompressez le package dans votre répertoire home, et allez dans 
+    le répértoire qui vient d'être créé.
 
+    Maintenant, tapez ./Config pour lancer le script de configuration. Il va 
+    vous poser quelques questions, et compiler Anope sur votre système. Si vous
+    ne savez pas répondre à une question, utilisez la valeur par défaut. La 
+    question d'utiliser CMake ou configure dépend de la décision que vous avez 
+    prise précedemment. Si vous avez CMake et que vous souhaitez l'utiliser, 
+    répondez avec cmake, sinon répondez avec configure.
 
-     Si c'est installé, vous aurez une ligne qui dit quelque chose qui ressemble à
+    Vous pouvez maintenant taper make pour compiler Anope. S'il y'a des erreurs
+    dans le Makefile, *essayez d'utiliser* gmake à la place. Si cela ne 
+    fonctionne toujours pas, vous (ou votre administrateur système) devriez
+    installer GNU make. 
+    Vous pouvez le trouver ici : ftp://prep.ai.mit.edu/pub/gnu/.
 
-     «version 2.6 cmake-patch 1".
+    Maintenant, tapez make install (ou gmake install ; voir ci-dessus). Cela
+    permet d'installer tous les fichiers nécessaires dans les chemins que vous
+    avez spécifié au script configure, et de régler les permissions des fichiers.
+    Vous devez vous assurer que le répertoire data n'est pas accessible par les 
+    autres utilisateurs, des utilisateurs malveillants pourraient causer des
+    problèmes sur votre réseau, si les mots de passe ne sont pas chiffrés, 
+    ou lire les mémos de tout utilisateur.
 
-     Si la version est inférieure à 2,4 ou si vous obtenez une erreur disant que la commande n'a pas été trouvé,
-     vous ne serez pas en mesure d'utiliser CMake,
+    Si vous voyez des erreurs lors de ce processus, merci de nous envoyer un 
+    e-mail avec la sortie d'erreur *complète* et n'oubliez pas de mentionner 
+    les versions de votre système, compilateur et bibliothèque C++.
 
-     sauf si vous installez vous-même dans votre répertoire home. CMake
-     vous pouvez le téléchargé ici >  http://www.cmake.org/cmake/resources/software.html
+    Allez maintenant dans le répertoire de données (par défaut, ~/services/data).
+    Copiez l'exemple de fichier de configuration (example.conf) en services.conf
+    et ouvrez ce dernier avec votre éditeur de texte favori. Il contient toute 
+    les directives de  configuration. Anope va l'utiliser au démarrage. 
+    Lisez attentivement les instructions contenues dans le fichier. 
+    L'utilisation des valeurs par défaut n'est pas recommendé et Anope ne 
+    fonctionnera probablement pas.
 
+    Si vous avez besoin d'aide, abonnez-vous à la liste de diffusion Anope
+    et envoyez-y vos e-mails pour obtenir de l'aide de la part des autres
+    utilisateurs. Voir le fichier README pour plus d'informations.
 
-     Si vous n'arrivez pas à installer (soit en raison du manque d'espace
-     ou de restrictions par votre fournisseur d'hébergement),
-     vous pouvez encore utiliser le script de configuration fournis.
-     Cette option n'est pas recommandée et finira par être retiré, mais il est fourni pour la compatibilité de ces
-     manque de CMake.
+2) Mettre à jour Anope
 
+    Pour mettre à jour Anope, suivez simplement les instructions d'installation
+    décrites dans la section 1. Il y a cependant une ligne de conduite 
+    spécifique :
 
+        * IMPORTANT : Sauvegardez vos anciennes bases de données !
+        * Si vous mettez à jour vers une nouvelle version majeure, toujours 
+	  redémarrer avec un fichier de configuration neuf depuis example.conf.
 
-    Ensuite, décompressez le package dans votre répertoire home, et allez dans le répértoire
-    qui viens d'être crée.
+3) Configuration de l'IRCd
 
-    Maintenant, tapez ./Config pour lancer le script de configuration. Il va vous poser
-    quelques questions, et compiler Anope sur votre système.
+    Les Services agissent comme un serveur IRC avec des pseudo-clients. 
+    Pour les relier à votre réseau, vous aurez besoin de configurer votre IRCd
+    pour permettre aux services de linker.
 
-    Si vous ne savez pas repondre à une question, utilisez la valeur par défaut.
+    La configuration varie selon les IRCd, mais vous aurez probablement besoin
+    d'un block link (aussi appelé connect block, ou C line), un U line (aussi
+    appelé shared block) et assurez-vous que l'IRCd écoute sur le port donné
+    dans le block link.
 
+    Des exemples de configurations de link peuvent être trouvés dans le fichier
+    example.conf pour certains des IRCd les plus populaires.
 
-    Vous pouvez maintenant taper make pour compiler Anope. S'il ya des erreurs dans la
-    Makefile, * essayez d'utiliser * gmake au lieu. Si cela ne fonctionne toujours pas, vous (ou
-    votre fournisseur ) doit installer GNU make. Vous pouvez
-    le Trouvez sur ftp://prep.ai.mit.edu/pub/gnu/.
+    Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
-    Maintenant, tapez make install (ou gmake install; voir ci-dessus). Cela permet d'installer
-    tous les fichiers nécessaires dans les chemins que vous avez spécifié dans la configuration 
-    script, et les permissions du fichier de configuration. Vous devez vous assurer que les données
-    répertoire ne sont pas accessible par d'autres utilisateurs, que des utilisateurs malveillants peuvent
-    causer des problèmes sur votre réseau, si les mots de passe ne sont pas cryptés, ou de lire
-    les mémos de tout utilisateur.
-
-    Si vous voyez des erreurs lors de ce processus, s'il vous plaît nous envoyer un mail avec le * complet *
-    sortie d'erreur, et n'oubliez pas de mentionner votre OS, compilateur et bibliothèque C + +
-    versions.
-
-    Maintenant, allez dans le répertoire de données (par défaut, cd ~/services/data). ouvrer exemple.conf
-    avec votre éditeur de texte favori. Il contient toute la configuration
-    directives. Anope va l'utiliser au démarrage. Lisez attentivement les instructions contenues dans
-    le fichier. l'utilisation des valeurs par defauld n'est pas recomment et anope ne risque pas de fonctionner
-
-
-    Si vous avez besoin d'aide, vous devez vous abonner à la mailing list et par courrier Anope
-    pour se faire aider par d'autres utilisateurs. Voir le fichier README pour plus de
-    informations.
-
-2) Mise à jour Anope
-
-    Si vous avez un fichier .Diff et que vous voulez patcher les ancienne sources Anope avec,
-    effectuer les opérations suivantes:
-
-        * Copiez le fichier .Diff dans le répertoire racine des sources Anope.
-        * Type de patch-p1 <file.diff
-
-   Notez que la mise à jour anope avec un fichier patch n'est pas recommandé. 
-   Vous devez télécharger une nouvelle source propre, car cela vous donnera les meilleurs résultats..
-
-    Pour mettre à jour Anope, suivez simplement les instructions d'installation décrites dans
-    l'article 1. Il y a cependant quelques règles spécifiques:
-
-        * IMPORTANT: Sauvegardez vos anciennes bases de données!
-        * Si vous mettez à jour vers une nouvelle version majeure, toujours redémarrer avec un 
-          fichier de configuration neuve example.conf.
-
-
-
-3) Mise en place du IRCd
-
-    Ce Services agit comme un serveur IRC avec des pseudo-clients sur elle. Pour les relier à
-    votre réseau, vous aurez besoin d'ajouter quelques lignes dans le ircd.conf de leur plate-forme
-    serveur (comme indiqué dans la directive de configuration RemoteServer).
-
-    Pour les échantillons ci-dessous, nous allons prendre services.localhost.net que le nom de la
-    Services (comme indiqué dans la directive de configuration ServerName). Notez que
-    présente des échantillons sont faites pour être aussi générique que possible, mais il pourrait y avoir
-    de petites variations, en fonction de votre IRCd. Pour IRCd aide spécifique aux
-    de configuration, lire près de la fin de cette section.
-
-    Tout d'abord, les lignes C / N, qui permettent aux services de crée un lien. Ils ont également besoin d'un
-    Y: ligne fonctionne correctement.
-
-        Y: 27:180:0:0:4000000
-        C: 127.0.0.1: mypass: services.localhost.net: 30
-        N: 127.0.0.1: mypass: services.localhost.net: 30
-
-    "mot de pass" est le même mot de passe que vous avez mentionné dans le RemoteServer
-    directive de configuration. 127.0.0.1 est l'adresse IP à partir de laquelle les services se connecterons
-    à partir de (reliant en localhost est le moyen le plus efficace pour exécuter les services).
-
-    Ensuite, vous avez à mettre en place un U:ligne, qui permettra aux services de changer
-    modes de canal, de sujets, et bien plus encore, sans être op sur le canal.
-
-        U: services.localhost.net: *: *
-
-    REMARQUE: si vous avez plus d'un serveur dans votre réseau, cette ligne doit
-          être ajouté sur tous les autres serveurs, où cela ne risque pas de fonctionner correctement.
-
-    Enfin, vous aurez besoin d'ajouter un H:ligne, pour permttre la commande OperServ JUPE
-    de fonctionner correctement.
-
-        H:*::Services.LocalHost.Net
-
-    Ne pas oublier de /rehash votre IRCd pour appliquer les modifications.
-
-   Une nouvelle tendance dans la configuration ircd  hybride, Unreal et Bahamut, qui utilisent une approche plus
-    «Lisibles» sous forme de configuration. Pour ceux, utiliser quelque chose comme:
-
-        link services.localhost.net
-        {
-            username        *;
-            hostname        localhost;
-            bind-ip         *;
-            port            6667;
-            hub             *;
-            password-connect "mypass";
-            password-receive "mypass";
-            class           servers;
-        };
-
-    Notez que ce bloc de fichiers de configuration de style est diffèrent 
-    sur le IRCd. Consultez le fabricant de lien interactif (le lien est ci-dessous) pour plus
-    détails sur la configuration exacte utilisée par votre IRCd.
-
-    Si vous êtes incapable d'obtenir un lien avec votre IRCd après la lecture de cet article,
-    vous pouvez essayer le fabricant lien interactif, qui est situé au:
+    Vous pouvez également essayer notre créateur de link interactif situé ici :
 
         http://anope.org/ilm.php
 
-4) A partir Anope
+4) Mettre en route Anope
 
-    Allez dans le répertoire où les fichiers binaires ont été installés (par défaut, ce n'est
-    ~/ Services/ bin). Tapez. /Services à lancer Anope.
+    Allez dans le répertoire où les fichiers binaires ont été installés (par 
+    défaut, ~/services/bin). Tapez ./services pour lancer Anope.
 
-    S'il ya des erreurs de syntaxe dans le fichier de configuration, ils seront
-    affiche sur l'écran. Corrigez-les jusqu'à ce qu'il n'y à plus d'erreur.
+    S'il ya des erreurs de syntaxe dans le fichier de configuration, elles 
+    seront affichées sur l'écran. Corrigez-les jusqu'à ce qu'il n'y en ait plus.
     Un démarrage réussi ne générera pas de message.
 
-    Donner aux services au moins une minute pour se connecté à votre réseau, comme certains
-    IRCds sur certains OS peut être très lent pour le processus de liaison. Si rien n'arrive après environ une minute,
-    il y a probablement un problème de configuration. Essayez
-    de lancer Anope en mode debug  ./services-debug-nofork pour voir toutes les erreurs qu'il
-    rencontres, et d'essayer de les corriger.
+    Donnez aux services au moins une minute pour se connecter à votre réseau. 
+    Certains IRCds sur certains systèmes peuvent être très lents pour le 
+    processus de liaison. Si rien n'arrive après environ une minute, il y a
+    probablement un problème de configuration. Essayez de lancer Anope en mode
+    debug ./services -debug -nofork pour voir toutes les erreurs rencontrées
+    et essayez de les corriger.
 
-    Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à vous abonner à la Anope
-    liste de diffusion et de poser là. Voir le fichier README pour plus de détails.
+    Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à vous
+    abonner à la liste de diffusion Anope et d'y poser vos question. 
+    Voir le fichier README pour plus de détails.
 
 5) Mettre en place un crontab
 
-    Une entrée crontab vous permettra de vérifier périodiquement que Anope est
-    toujours en cours, et redémarrez-le s'il n'est pas.
+    Une entrée crontab vous permettra de vérifier périodiquement si Anope est
+    toujours en cours d'exécution et de le redémarrer s'il n'est pas.
 
-    D'abord renommer le script example.chk qui est dans le chemin de Anope (par défaut,
-    cela est ~/services/data) pour services.chk et le modifier. Vous aurez besoin de
-    modifier la partie configuration du fichier. Assurez-vous ensuite que le fichier est
-    marqué comme exécutable en tapant chmod + x services.chk, et essayer de lancer le
-    script pour voir si cela fonctionne (Anope ne doit pas être en marche lorsque vous faites cela ;))
+    D'abord renommez le script example.chk qui est dans le chemin d'Anope 
+    (par défaut, ~/services/data) en services.chk et modifiez-le. Vous aurez 
+    besoin de modifier la partie CONFIGURATION du fichier. Assurez-vous ensuite
+    que le fichier est marqué comme exécutable en tapant chmod +x services.chk
+    et essayez de lancer le script pour voir si cela fonctionne (Anope ne doit 
+    pas être en marche lorsque vous faites cela ;))
 
-    Lorsque cela est fait, vous devrez ajouter l'entrée crontab. Type de crontab-e. 
-    Cela va ouvrir l'éditeur de texte par défaut avec le fichier crontab. Entrez le chemin
-    suivant (avec le chemin correct):
+    Lorsque c'est fait, vous devrez ajouter l'entrée crontab. Tapez crontab -e. 
+    Cela va ouvrir l'éditeur de texte par défaut avec le fichier crontab.
+    Entrez la ligne suivante (avec le chemin correct) :
 
-        * / 5 * * * * /home/ircd/services/data/services.chk> /dev/nul 2> & 1
+        */5 * * * * /home/ircd/services/data/services.chk > /dev/null 2>&1
 
-    Le * / 5 au commencement signifie "vérifier toutes les 5 minutes". Vous pouvez remplacer
-    le 5 avec un autre numéro si vous voulez (mais moins de 60). Consulter
-    pages de manuel de votre système pour plus de détails sur la syntaxe de la crontab
-    fichier. Intéressant pages de manuel sont crontab (5), crontab (1) et cron (8).
+    Le */5 au début signifie "vérifier toutes les 5 minutes". Vous pouvez
+    remplacer le 5 par un autre numéro si vous voulez (mais moins de 60). 
+    Consultez pages de manuel de votre système pour plus de détails sur la 
+    syntaxe du fichier crontab. Les pages de manuel intéressantes sont
+    crontab(5), crontab(1) et cron(8).
 
-    Sauvegarder et quitter, et il est installé.
+    Sauvegardez, quittez et c'est installé.

docs/IRCD

@@ -1,202 +0,0 @@
-How To Add IRCd Support
------------------------
-
-1) Files to Edit
-2) The Code
-3) The IRCDVar struct
-4) Modes
-5) Functions / Events
-6) CAPAB/PROTOCTL 
-7) IRCDProto Class
-
-1) Files to Edit
-
-    When preparing to add supprt to Anope for your IRCd, you need to edit
-    the following files
-
-    A) Make a copy of the .cpp file of the IRCd that matches the IRCd that
-       you are attempting to add support for best.
-    B) Add your IRCd into the supported IRCds in example.conf
-
-2) The Code
-
-    Here is where the code of the .cpp file comes in. Be prepared to spend at
-    least an hour, if not longer, going over the code and getting it right;
-    Especially if you are setting up an ircd that is completely different
-    than the one you used as a base. This section covers the majority of the
-    code that is in use. 
-
-    The first bit of code you will face is the IRCDVar structure, This is one
-    of two structs which holds your IRCd information; This allows you to quickly
-    setup your specific ircd.
-
-        IRCDVar myIrcd[] = { };
-
-    This struct contains your basic IRCd functions. Your base source file has
-    the list of all available variables; note that you should not swap any
-    around, or you will break stuff. Here is a brief description of the usage
-    of each.
-
-    1) Name: This member tells Anope about the IRCD's name. It may contain
-             text about it's name and version. This is used to identify the
-             build on startup.
-
-    2) Pseudo Client Mode: This is the user mode set by Anope on all BotServ
-                           bots. Normally you want this to be a some form of
-                           service or bot flag; you can use + for no mode at
-                           all.
-
-    3) Max Channelmode Symbols: This is the total number of possible channel
-                                 modes that can appear before a nick. Do
-                                 remember to count each possible mode, so +ov
-                                 is 2.
-
-    4) SVSNICK: Can the ircd use SVSNICK to change some ones nick? Otherwise,
-                 KILL is used. Use 1 for yes, 0 for no.
-
-    5) VHOST: Can a user's host be changed on the fly? Enabling this allow
-               HostServ online. Use 1 for yes, 0 for no.
-
-    6) SNLINE: Does the IRCd support realname (geocs) bans? Use 1 for yes,
-                0 for no.
-
-    7) SQLINE: Does the IRCd support nick bans? Use 1 for yes, 0 for no.
-
-    8) SZLINE: Does the IRCd support SZLINES? Use 1 for yes, 0 for no.
-
-    10) Join to Message: Services must join a channel to send any message to
-                         that channel (cannot override +n). Use 1 for yes,
-                         0 for no.
-
-    11) SQline Channels: The IRCd's supports banning channel names via
-                         SQLINES. Use 1 for yes, 0 for no.
-
-    12) Quit On Kill: When we (SVS)KILL a user, does the IRCd send back a
-                      QUIT message for that user? Use 1 for yes, 0 for no.
-
-    13) SVSMODE UNBAN: We can use SVSMODE to unban hosts from a channel. Use
-                    1 for yes, 0 for no.
-
-    14) Reverse: We can do a reverse check when unbanning. For use with 
-                 DreamForge based IRCd's. Use 1 for yes, 0 for no.
-
-    15) vIdent: Support for including a user's ident in their vHost. Use
-                1 for yes, 0 for no.
-
-    16) SVSHOLD: Support for temporarily 'holding' a nick, instead of using
-                 a nick enforcer client. Use 1 for yes, 0 for no.
-
-    17) TS on MODE: We need to send a timestamp when modes are being changed.
-                    Use 1 for yes, 0 for no.
-
-    18) Umode: We can use OperServ to change a user's mode. Use 1 for yes,
-               0 for no.
-
-    19) OMODE: We can use OperServ to give some user a temporary O:LINE.
-               Use 1 for yes, 0 for no.
-
-    20) No Knock Requires +i: Does the No Knock channel mode require invite
-                              only channels? Use 1 for yes, 0 for no.
-    
-    21) SVSMODE UCMODE: Can we clear user channel modes with SVSMODE? Use
-                        1 for yes, 0 for no.
-
-    22) SGline Enforce: Does the IRCd enforce SNLINES for us or do we need to
-                        do so? Use 1 for yes, 0 for no.
-
-    23) TS6: Does the IRCd support TS6? Use 1 for yes, 0 for no.
-
-    24) Global TLD Prefix: Prefix used to send global messages, should probably
-                           be "$"
-
-    25) Max Modes: The max number of mode changes we can send in one line
-
-3) Modes 
-
-   Anope is told about modes in the protocol module.
-   For the most part, the syntax for adding channel and user modes are:
-   
-   ModeManager::AddUserMode(new UserMode(UMODE_NETADMIN, "UMODE_NETADMIN", 'N'));
-   Where 'N' is the char for the mode, and UMODE_NETADMIN shows what the
-   mode does. Or:
-
-   ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
-   Where 'c' is the char for the mode and CMODE_BLOCKCOLOR shows what
-   the mode does
-
-   A full list of valid mode names for the second param can be found
-   in services.h in the enum for ChannelModeName and UserModeName
-   If necessary, you can add additional modes to this list.
-
-   Adding simple modes with parameters is similar, instead adding a
-   'new ChannelMode', use 'new ChannelModeParam', set the third optional
-   arg of ChannelModeParam to false if the param should NOT be sent when unsetting
-   it. Eg:
-
-   ModeManager::AddChannelMode(new ChannelModeParam(CMODE_JOINFLOOD, "CMODE_JOINFLOOD", 'j', true));
-
-   Anope will internally track the params, and they can be retrieved through
-   Channel::GetParam();
-
-   If you want to make param validity checking for a mode, you must create a new
-   class which inherits from ChannelModeParam and overload the IsValid function.
-   Modes CMODE_OPERONLY, CMODE_ADMINONLY, and CMODE_REGISTERED already exist
-   internally as classes, to overload the CanSet function to disable non opers
-   from mlocking (or in CMODE_REGISTERED's case, anyone) from setting them.
-   This should be added like:
-
-   ModeManager::AddChannelMode(new ChannelModeOper('O'));
-
-4) Functions and Events
-
-    A brief word about functions and events. All events are captured by creating a Message struct
-    with the name of the message and the callback function:
-
-    Message my_message("MESSAGE", do_my_messsage);
-
-    Each message should have a message handler if its important enough to be
-    processed by services. All event functions should be formed like this:
-
-	bool do_my_message(const Anope::string &source, const std::vector<Anope::string> &params)
-        {
-		return true;
-        }
-
-    They will receive the source; this can be empty at times depending on the
-    event. Next, params holds the arguments for the event. Events are likely to
-    pass to various upper level event handlers; see the previous ircd source for
-    how they handle these events.
-
-5) CAPAB/PROTOCTL
-
-    Most IRCDs send a CAPAB or PROTOCTL line so that they can work out what
-    the other end of the connection is capable of doing. The protocol module should
-    handle all of these without the cores knowledge with the exception of the following:
-    
-       --------------------------------------------------------------------------
-       Define          |  Description
-       ----------------|---------------------------------------------------------
-       CAPAB_NOQUIT    |  NOQUIT protocol support
-       CAPAB_TSMODE    |  Chanmodes are timestamped
-       CAPAB_UNCONNECT |  UNCONNECT protocol support
-       CAPAB_QS        |  Quitstorm - same as NOQUIT
-
-   You can override the default OnCapab method in IRCdMessage if required.
-
-6) IRCDProto Class
-
-    The IRCDProto class is set up like:
-
-    class MyIRCdProto : public IRCDProto { } ircdproto;
-
-    And told to Anope through the
-
-    pmodule_ircd_proto(&ircd_proto);
-
-    function.
-
-    This is used for sending out specific messages from Anope to your IRCd.
-    A list of all of the valid function names to overload and their args
-    are in services.h. If the protocol module you are editing is similar enough
-    to the IRCd you are adding support for, many of these probably won't need to
-    be changed.

docs/LANGUAGE

@@ -8,8 +8,15 @@ Anope Mutli Language Support
 1) Building Anope with gettext support
 
     To build Anope with gettext support, gettext and its development libraries must be installed on the system.
-    Anope does not require locales to be installed or enabled on the system, but does require the locales-all
-    package on Debian and Debian based systems.
+
+    On Debian install the locales-all package.
+
+    On Ubuntu run locale-gen for each language you want to enable.
+        For example:
+        locale-gen es_ES.UTF-8
+
+        Then execute:
+        dpkg-reconfigure locales
 
     Building Anope on Windows with gettext support is explained in docs/WIN32.txt
 

docs/README

@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2013 Anope Team    <team@anope.org>.
+Anope is          2003-2014 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 

docs/WIN32.txt

@@ -71,9 +71,10 @@ Anope for Windows
        our IRC Support channel for assistance.
 
        Some Anope modules require third party libraries, such as m_mysql and
-       m_ssl. If these libraries are installed in nonstandard locations, cmake
-       will probably not find them and should be told where they are by passing
-       additional search paths to the last question in Config, such as:
+       the SSL modules. If these libraries are installed in nonstandard
+       locations, cmake will probably not find them and should be told where
+       they are by passing additional search paths to the last question in
+       Config, such as:
 
        -DEXTRA_INCLUDE:STRING=c:/openssl/include;c:/mysql/include
        -DEXTRA_LIBS:STRING=c:/openssl/lib;c:/mysql/lib

docs/XMLRPC/xmlrpc.php

@@ -1,7 +1,7 @@
 <?php
 /* XMLRPC Functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  */
@@ -74,7 +74,7 @@ class AnopeXMLRPC
 	 */
 	function DoChannel($Channel)
 	{
-		return $this->RunXMLRPC("channel", NULL);
+		return $this->RunXMLRPC("channel", array($Channel));
 	}
 
 	/* Like DoChannel(), but different.

extras

@@ -147,8 +147,13 @@ while (1)
 	chop($input); # remove the trailing \n from the user input
 
 	if ($input eq "q") {
-		if (-e "build") {
-			system("cmake", "build/.");
+		if (-e "build/CMakeFiles") {
+			if (-e "cmake-bin") {
+				my $cmake_path = `find cmake-bin -name cmake -print0`;
+				system($cmake_path, "build/.");
+			} else {
+				system("cmake", "build/.");
+			}
 			print "\nNow cd build, then run make to build Anope.\n\n";
 		} else {
 			print "\nBuild directory not found. You should run ./Config now.\n\n"

include/access.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -123,8 +123,8 @@ class CoreExport ChanAccess : public Serializable
 	virtual void AccessUnserialize(const Anope::string &data) = 0;
 
 	/* Comparison operators to other Access entries */
-	bool operator>(const ChanAccess &other) const;
-	bool operator<(const ChanAccess &other) const;
+	virtual bool operator>(const ChanAccess &other) const;
+	virtual bool operator<(const ChanAccess &other) const;
 	bool operator>=(const ChanAccess &other) const;
 	bool operator<=(const ChanAccess &other) const;
 };

include/account.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/anope.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -115,6 +115,7 @@ namespace Anope
 		 * The following functions return the various types of strings.
 		 */
 		inline const char *c_str() const { return this->_string.c_str(); }
+		inline const char *data() const { return this->_string.data(); }
 		inline std::string &str() { return this->_string; }
 		inline const std::string &str() const { return this->_string; }
 		inline ci::string ci_str() const { return ci::string(this->_string.c_str()); }
@@ -159,24 +160,24 @@ namespace Anope
 		 * Trim leading and trailing white spaces from the string.
 		 */
 
-		inline string& ltrim()
+		inline string& ltrim(const Anope::string &what = " \t\r\n")
 		{
-			while (!this->_string.empty() && isspace(this->_string[0]))
+			while (!this->_string.empty() && what.find(this->_string[0]) != Anope::string::npos)
 				this->_string.erase(this->_string.begin());
 			return *this;
 		}
 
-		inline string& rtrim()
+		inline string& rtrim(const Anope::string &what = " \t\r\n")
 		{
-			while (!this->_string.empty() && isspace(this->_string[this->_string.length() - 1]))
+			while (!this->_string.empty() && what.find(this->_string[this->_string.length() - 1]) != Anope::string::npos)
 				this->_string.erase(this->_string.length() - 1);
 			return *this;
 		}
 
-		inline string& trim()
+		inline string& trim(const Anope::string &what = " \t\r\n")
 		{
-			this->ltrim();
-			this->rtrim();
+			this->ltrim(what);
+			this->rtrim(what);
 			return *this;
 		}
 
@@ -499,21 +500,21 @@ namespace Anope
 
 	/** Retrieves a human readable string representing the time in seconds
 	 * @param seconds The time on seconds, eg 60
-	 * @param nc The account to use langauge settings for to translate this string, if applicable
+	 * @param nc The account to use language settings for to translate this string, if applicable
 	 * @return A human readable string, eg "1 minute"
 	 */
 	extern CoreExport Anope::string Duration(time_t seconds, const NickCore *nc = NULL);
 
 	/** Generates a human readable string of type "expires in ..."
 	 * @param expires time in seconds
-	 * @param nc The account to use langauge settings for to translate this string, if applicable
+	 * @param nc The account to use language settings for to translate this string, if applicable
 	 * @return A human readable string, eg "expires in 5 days"
 	 */
 	extern CoreExport Anope::string Expires(time_t seconds, const NickCore *nc = NULL);
 
 	/** Converts a time in seconds (epoch) to a human readable format.
 	 * @param t The time
-	 * @param nc The account to use langauge settings for to translate this string, if applicable
+	 * @param nc The account to use language settings for to translate this string, if applicable
 	 * @param short_output If true, the output is just a date (eg, "Apr 12 20:18:22 2009 MSD"), else it includes the date and how long ago/from now that date is, (eg "Apr 12 20:18:22 2009 MSD (1313 days, 9 hours, 32 minutes ago)"
 	 */
 	extern CoreExport Anope::string strftime(time_t t, const NickCore *nc = NULL, bool short_output = false);
@@ -621,7 +622,7 @@ class commasepstream : public sepstream
  public:
 	/** Initialize with comma seperator
 	 */
-	commasepstream(const Anope::string &source) : sepstream(source, ',') { }
+	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
 };
 
 /** A derived form of sepstream, which seperates on spaces
@@ -762,17 +763,18 @@ template<typename T> inline T convertTo(const Anope::string &s, bool failIfLefto
  */
 #ifdef DEBUG_BUILD
 # include <typeinfo>
-#endif
 template<typename T, typename O> inline T anope_dynamic_static_cast(O ptr)
 {
-#ifdef DEBUG_BUILD
 	T ret = dynamic_cast<T>(ptr);
 	if (ptr != NULL && ret == NULL)
 		throw CoreException(Anope::string("anope_dynamic_static_cast<") + typeid(T).name() + ">(" + typeid(O).name() + ") fail");
 	return ret;
-#else
-	return static_cast<T>(ptr);
-#endif
 }
+#else
+template<typename T, typename O> inline T anope_dynamic_static_cast(O ptr)
+{
+	return static_cast<T>(ptr);
+}
+#endif
 
 #endif // ANOPE_H

include/base.h

@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (C) 2008-2011 Adam <Adam@anope.org>
- * Copyright (C) 2008-2013 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2014 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *

include/bots.h

@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2013 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2014 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *
@@ -60,6 +60,8 @@ class CoreExport BotInfo : public User, public Serializable
 
 	void GenerateUID();
 
+	void OnKill();
+
 	/** Change the nickname for the bot.
 	 * @param newnick The nick to change to
 	 */

include/channels.h

@@ -1,6 +1,6 @@
 /* Channel support
  *
- * (C) 2008-2013 Anope Team
+ * (C) 2008-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/config.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -129,6 +129,7 @@ namespace Configuration
 		Anope::map<Anope::string> bots;
 
 		Conf();
+		~Conf();
 
 		void LoadConf(File &file);
 

include/defs.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -52,4 +52,5 @@ struct Exception;
 struct MemoInfo;
 struct ModeLock;
 struct Oper;
+namespace SASL { struct Message; }
 

include/extensible.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/hashcomp.h

@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (C) 2002-2011 InspIRCd Development Team
- * Copyright (C) 2009-2013 Anope Team <team@anope.org>
+ * Copyright (C) 2009-2014 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *

include/language.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2013 Anope Team
+ * (C) 2008-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/lists.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/logger.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -92,7 +92,7 @@ class CoreExport Log
 
 	Log(BotInfo *b, const Anope::string &category = "");
 
-	Log(Module *m, const Anope::string &category = "");
+	Log(Module *m, const Anope::string &category = "", BotInfo *bi = NULL);
 
 	~Log();
 

include/mail.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/memo.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/messages.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modes.h

@@ -1,7 +1,7 @@
 /* Mode support
  *
  * Copyright (C) 2008-2011 Adam <Adam@anope.org>
- * Copyright (C) 2008-2013 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2014 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/module.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -185,9 +185,9 @@ class ModuleVersion
 
  public:
 	/** Constructor
-	 * @param major The major version numbber
-	 * @param minor The minor version numbber
-	 * @param patch The patch version numbber
+	 * @param major The major version number
+	 * @param minor The minor version number
+	 * @param patch The patch version number
 	 */
 	ModuleVersion(int major, int minor, int patch);
 
@@ -867,6 +867,11 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnSetVhost(NickAlias *na) { throw NotImplementedException(); }
 
+	/** Called when a users host changes
+	 * @param u The user
+	 */
+	virtual void OnSetDisplayedHost(User *) { throw NotImplementedException(); }
+
 	/** Called when a memo is sent
 	 * @param source The source of the memo
 	 * @param target The target of the memo
@@ -1005,7 +1010,7 @@ class CoreExport Module : public Extensible
 	 * mostly to ensure mlock/+r are set.
 	 * @param c The channel
 	 */
-	virtual void OnCheckModes(Channel *c) { throw NotImplementedException(); }
+	virtual void OnCheckModes(Reference<Channel> &c) { throw NotImplementedException(); }
 
 	/** Called when a channel is synced.
 	 * Channels are synced after a sjoin is finished processing
@@ -1093,7 +1098,7 @@ enum Implementation
 	I_OnUserLogin, I_OnNickLogout, I_OnNickRegister, I_OnNickSuspend, I_OnNickUnsuspended, I_OnDelNick, I_OnNickCoreCreate,
 	I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickClearAccess, I_OnNickAddAccess, I_OnNickEraseAccess, I_OnNickClearCert,
 	I_OnNickAddCert, I_OnNickEraseCert, I_OnNickInfo, I_OnBotInfo, I_OnCheckAuthentication, I_OnNickUpdate,
-	I_OnFingerprint, I_OnUserAway, I_OnInvite, I_OnDeleteVhost, I_OnSetVhost, I_OnMemoSend, I_OnMemoDel,
+	I_OnFingerprint, I_OnUserAway, I_OnInvite, I_OnDeleteVhost, I_OnSetVhost, I_OnSetDisplayedHost, I_OnMemoSend, I_OnMemoDel,
 	I_OnChannelModeSet, I_OnChannelModeUnset, I_OnUserModeSet, I_OnUserModeUnset, I_OnChannelModeAdd, I_OnUserModeAdd,
 	I_OnMLock, I_OnUnMLock, I_OnModuleLoad, I_OnModuleUnload, I_OnServerSync, I_OnUplinkSync, I_OnBotPrivmsg, I_OnBotNotice,
 	I_OnPrivmsg, I_OnLog, I_OnLogMessage, I_OnDnsRequest, I_OnCheckModes, I_OnChannelSync, I_OnSetCorrectModes,

include/modules/bs_badwords.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/bs_kick.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_entrymsg.h

@@ -0,0 +1,35 @@
+/*
+ * (C) 2003-2014 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ *
+ */
+
+struct EntryMsg
+{
+	Anope::string chan;
+	Anope::string creator;
+	Anope::string message;
+	time_t when;
+
+	virtual ~EntryMsg() { }
+ protected:
+	EntryMsg() { }
+};
+
+struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
+{
+ protected:
+	EntryMessageList() : Serialize::Checker<std::vector<EntryMsg *> >("EntryMsg") { }
+
+ public:
+	virtual ~EntryMessageList()
+	{
+		for (unsigned i = (*this)->size(); i > 0; --i)
+			delete (*this)->at(i - 1);
+	}
+
+	virtual EntryMsg* Create() = 0;
+};
+

include/modules/cs_log.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_mode.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_suspend.h

@@ -1,20 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2013 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-struct CSSuspendInfo
-{
-	Anope::string chan, by, reason;
-	time_t time, expires;
-
-	virtual ~CSSuspendInfo() { }
- protected:
-	CSSuspendInfo() { }
-};

include/modules/dns.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/encryption.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ns_cert.h

@@ -1,6 +1,6 @@
 /* NickServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -60,3 +60,12 @@ struct NSCertList
 
 	virtual void Check() = 0;
 };
+
+class CertService : public Service
+{
+ public:
+	CertService(Module *c) : Service(c, "CertService", "certs") { }
+
+	virtual NickCore* FindAccountFromCert(const Anope::string &cert) = 0;
+};
+

include/modules/os_forbid.h

@@ -10,7 +10,7 @@ enum ForbidType
 	FT_SIZE
 };
 
-struct ForbidData : Serializable
+struct ForbidData
 {
 	Anope::string mask;
 	Anope::string creator;
@@ -19,9 +19,9 @@ struct ForbidData : Serializable
 	time_t expires;
 	ForbidType type;
 
-	ForbidData() : Serializable("ForbidData") { }
-	void Serialize(Serialize::Data &data) const anope_override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
+	virtual ~ForbidData() { }
+ protected:
+	ForbidData() : created(0), expires(0) { }
 };
 
 class ForbidService : public Service
@@ -33,6 +33,8 @@ class ForbidService : public Service
 
 	virtual void RemoveForbid(ForbidData *d) = 0;
 
+	virtual ForbidData* CreateForbid() = 0;
+
 	virtual ForbidData *FindForbid(const Anope::string &mask, ForbidType type) = 0;
 
 	virtual std::vector<ForbidData *> GetForbids() = 0;
@@ -40,43 +42,5 @@ class ForbidService : public Service
 
 static ServiceReference<ForbidService> forbid_service("ForbidService", "forbid");
 
-void ForbidData::Serialize(Serialize::Data &data) const
-{
-	data["mask"] << this->mask;
-	data["creator"] << this->creator;
-	data["reason"] << this->reason;
-	data["created"] << this->created;
-	data["expires"] << this->expires;
-	data["type"] << this->type;
-}
-
-Serializable* ForbidData::Unserialize(Serializable *obj, Serialize::Data &data)
-{
-	if (!forbid_service)
-		return NULL;
-
-	ForbidData *fb;
-	if (obj)
-		fb = anope_dynamic_static_cast<ForbidData *>(obj);
-	else
-		fb = new ForbidData;
-
-	data["mask"] >> fb->mask;
-	data["creator"] >> fb->creator;
-	data["reason"] >> fb->reason;
-	data["created"] >> fb->created;
-	data["expires"] >> fb->expires;
-	unsigned int t;
-	data["type"] >> t;
-	fb->type = static_cast<ForbidType>(t);
-
-	if (t > FT_SIZE - 1)
-		return NULL;
-
-	if (!obj)
-		forbid_service->AddForbid(fb);
-	return fb;
-}
-
 #endif
 

include/modules/os_ignore.h

@@ -1,6 +1,6 @@
 /* OperServ ignore interface
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -10,70 +10,36 @@
  */
 
 
-struct IgnoreData : Serializable
+struct IgnoreData
 {
 	Anope::string mask;
 	Anope::string creator;
 	Anope::string reason;
 	time_t time; /* When do we stop ignoring them? */
 
-	IgnoreData() : Serializable("IgnoreData") { }
-	void Serialize(Serialize::Data &data) const anope_override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
+	virtual ~IgnoreData() { }
+ protected:
+	IgnoreData() : time(0) { }
 };
 
 class IgnoreService : public Service
 {
  protected:
-	std::list<IgnoreData> ignores;
-
 	IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { }
 	
  public:
-	virtual IgnoreData* AddIgnore(const Anope::string &mask, const Anope::string &creator, const Anope::string &reason, time_t delta = Anope::CurTime) = 0;
+	virtual void AddIgnore(IgnoreData *) = 0;
 
-	virtual bool DelIgnore(const Anope::string &mask) = 0;
+	virtual void DelIgnore(IgnoreData *) = 0;
 
-	inline void ClearIgnores() { this->ignores.clear(); }
+	virtual void ClearIgnores() = 0;
+
+	virtual IgnoreData *Create() = 0;
 
 	virtual IgnoreData *Find(const Anope::string &mask) = 0;
 
-	inline std::list<IgnoreData> &GetIgnores() { return this->ignores; }
+	virtual std::vector<IgnoreData *> &GetIgnores() = 0;
 };
 
 static ServiceReference<IgnoreService> ignore_service("IgnoreService", "ignore");
 
-void IgnoreData::Serialize(Serialize::Data &data) const
-{
-	data["mask"] << this->mask;
-	data["creator"] << this->creator;
-	data["reason"] << this->reason;
-	data["time"] << this->time;
-}
-
-Serializable* IgnoreData::Unserialize(Serializable *obj, Serialize::Data &data)
-{
-	if (!ignore_service)
-		return NULL;
-	
-	if (obj)
-	{
-		IgnoreData *ign = anope_dynamic_static_cast<IgnoreData *>(obj);
-		data["mask"] >> ign->mask;
-		data["creator"] >> ign->creator;
-		data["reason"] >> ign->reason;
-		data["time"] >> ign->time;
-		return ign;
-	}
-
-	Anope::string smask, screator, sreason;
-	time_t t;
-
-	data["mask"] >> smask;
-	data["creator"] >> screator;
-	data["reason"] >> sreason;
-	data["time"] >> t;
-
-	return ignore_service->AddIgnore(smask, screator, sreason, t);
-}
-

include/modules/os_news.h

@@ -23,14 +23,14 @@ struct NewsItem : Serializable
 	time_t time;
 
 	NewsItem() : Serializable("NewsItem") { }
-	void Serialize(Serialize::Data &data) const anope_override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
 class NewsService : public Service
 {
  public:
 	NewsService(Module *m) : Service(m, "NewsService", "news") { }
+
+	virtual NewsItem *CreateNewsItem() = 0;
 	
 	virtual void AddNewsItem(NewsItem *n) = 0;
 	
@@ -41,36 +41,5 @@ class NewsService : public Service
 
 static ServiceReference<NewsService> news_service("NewsService", "news");
 
-void NewsItem::Serialize(Serialize::Data &data) const
-{
-	data["type"] << this->type;
-	data["text"] << this->text;
-	data["who"] << this->who;
-	data["time"] << this->time;
-}
-
-Serializable* NewsItem::Unserialize(Serializable *obj, Serialize::Data &data)
-{
-	if (!news_service)
-		return NULL;
-
-	NewsItem *ni;
-	if (obj)
-		ni = anope_dynamic_static_cast<NewsItem *>(obj);
-	else
-		ni = new NewsItem();
-
-	unsigned int t;
-	data["type"] >> t;
-	ni->type = static_cast<NewsType>(t);
-	data["text"] >> ni->text;
-	data["who"] >> ni->who;
-	data["time"] >> ni->time;
-
-	if (!obj)
-		news_service->AddNewsItem(ni);
-	return ni;
-}
-
 #endif // OS_NEWS
 

include/modules/os_session.h

@@ -32,6 +32,8 @@ class SessionService : public Service
 
 	SessionService(Module *m) : Service(m, "SessionService", "session") { }
 
+	virtual Exception *CreateException() = 0;
+
 	virtual void AddException(Exception *e) = 0;
 
 	virtual void DelException(Exception *e) = 0;

include/modules/redis.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sasl.h

@@ -0,0 +1,123 @@
+/*
+ *
+ * (C) 2014 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+namespace SASL
+{
+	struct Message
+	{
+		Anope::string source;
+		Anope::string target;
+		Anope::string type;
+		Anope::string data;
+		Anope::string ext;
+	};
+
+	class Mechanism;
+	struct Session;
+
+	class Service : public ::Service
+	{
+	 public:
+		Service(Module *o) : ::Service(o, "SASL::Service", "sasl") { }
+
+		virtual void ProcessMessage(const Message &) = 0;
+
+		virtual Anope::string GetAgent() = 0;
+
+		virtual Session* GetSession(const Anope::string &uid) = 0;
+
+		virtual void SendMessage(SASL::Session *session, const Anope::string &type, const Anope::string &data) = 0;
+
+		virtual void Succeed(Session *, NickCore *) = 0;
+		virtual void Fail(Session *) = 0;
+		virtual void SendMechs(Session *) = 0;
+		virtual void DeleteSessions(Mechanism *, bool = false) = 0;
+		virtual void RemoveSession(Session *) = 0;
+	};
+
+	static ServiceReference<SASL::Service> sasl("SASL::Service", "sasl");
+
+	struct Session
+	{
+		time_t created;
+		Anope::string uid;
+		Reference<Mechanism> mech;
+
+		Session(Mechanism *m, const Anope::string &u) : created(Anope::CurTime), uid(u), mech(m) { }
+		virtual ~Session()
+		{
+			if (sasl)
+				sasl->RemoveSession(this);
+		}
+	};
+
+	/* PLAIN, EXTERNAL, etc */
+	class Mechanism : public ::Service
+	{
+	 public:
+		Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { }
+
+		virtual Session* CreateSession(const Anope::string &uid) { return new Session(this, uid); }
+
+		virtual void ProcessMessage(Session *session, const Message &) = 0;
+
+		virtual ~Mechanism()
+		{
+			if (sasl)
+				sasl->DeleteSessions(this, true);
+		}
+	};
+
+	class IdentifyRequest : public ::IdentifyRequest
+	{
+		Anope::string uid;
+
+	 public:
+		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass) : ::IdentifyRequest(m, acc, pass), uid(id) { }
+
+		void OnSuccess() anope_override
+		{
+			if (!sasl)
+				return;
+
+			NickAlias *na = NickAlias::Find(GetAccount());
+			if (!na || na->nc->HasExt("NS_SUSPENDED"))
+				return OnFail();
+
+			Session *s = sasl->GetSession(uid);
+			if (s)
+			{
+				Log(Config->GetClient("NickServ")) << "A user identified to account " << this->GetAccount() << " using SASL";
+				sasl->Succeed(s, na->nc);
+				delete s;
+			}
+		}
+
+		void OnFail() anope_override
+		{
+			if (!sasl)
+				return;
+
+			Session *s = sasl->GetSession(uid);
+			if (s)
+			{
+				sasl->Fail(s);
+				delete s;
+			}
+
+			Anope::string accountstatus;
+			NickAlias *na = NickAlias::Find(GetAccount());
+			if (!na)
+				accountstatus = "nonexistent ";
+			else if (na->nc->HasExt("NS_SUSPENDED"))
+				accountstatus = "suspended ";
+
+			Log(Config->GetClient("NickServ")) << "A user failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
+		}
+	};
+}

include/modules/set_misc.h

@@ -0,0 +1,17 @@
+/*
+ * (C) 2003-2014 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+struct MiscData
+{
+	Anope::string object;
+	Anope::string name;
+	Anope::string data;
+
+	MiscData() { }
+	virtual ~MiscData() { }
+};
+

include/modules/sql.h

@@ -1,5 +1,5 @@
 /*
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/suspend.h

@@ -1,6 +1,5 @@
-/* NickServ core functions
- *
- * (C) 2003-2013 Anope Team
+/*
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,12 +8,11 @@
  * Based on the original code of Services by Andy Church.
  */
 
-struct NSSuspendInfo
+struct SuspendInfo
 {
-	Anope::string nick, by, reason;
+	Anope::string what, by, reason;
 	time_t when, expires;
 
-	virtual ~NSSuspendInfo() { }
- protected:
-	NSSuspendInfo() { }
+	SuspendInfo() { }
+	virtual ~SuspendInfo() { }
 };

include/opertype.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2013 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2014 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *
@@ -25,15 +25,14 @@ struct CoreExport Oper
 	bool require_oper;
 	Anope::string password;
 	Anope::string certfp;
-	/* True if this operator is set in the config */
-	bool config;
 	/* Hosts allowed to use this operator block */
 	std::vector<Anope::string> hosts;
 	Anope::string vhost;
 
-	Oper(const Anope::string &n, OperType *o) : name(n), ot(o), require_oper(false), config(false) { }
+	Oper(const Anope::string &n, OperType *o);
+	virtual ~Oper();
 
-	virtual ~Oper() { }
+	static std::vector<Oper *> opers;
 	
 	/** Find an oper block by name
 	 * @param name The name

include/protocol.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -111,6 +111,8 @@ class CoreExport IRCDProto : public Service
 	virtual void SendSQLine(User *, const XLine *x) { }
 	virtual void SendSQLineDel(const XLine *x) { }
 
+	virtual void SendKill(const MessageSource &source, const Anope::string &target, const Anope::string &reason);
+
 	/** Kills a user
 	 * @param source Who is doing the kill
 	 * @param user The user to be killed
@@ -204,7 +206,7 @@ class CoreExport IRCDProto : public Service
 
 	virtual void SendNumeric(int numeric, const Anope::string &dest, const char *fmt, ...);
 
-	virtual void SendLogin(User *u) = 0;
+	virtual void SendLogin(User *u, NickAlias *na) = 0;
 	virtual void SendLogout(User *u) = 0;
 
 	/** Send a channel creation message to the uplink.
@@ -217,6 +219,9 @@ class CoreExport IRCDProto : public Service
 	 */
 	virtual void SendOper(User *u);
 
+	virtual void SendSASLMessage(const SASL::Message &) { }
+	virtual void SendSVSLogin(const Anope::string &uid, const Anope::string &acc) { }
+
 	virtual bool IsNickValid(const Anope::string &);
 	virtual bool IsChannelValid(const Anope::string &);
 	virtual bool IsIdentValid(const Anope::string &);

include/regchannel.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2013 Anope Team
+ * (C) 2008-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/regexpr.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/serialize.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/servers.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -62,7 +62,8 @@ class CoreExport Server : public Extensible
 	bool syncing;
 	/* The server is juped */
 	bool juped;
-
+	/* The server is about to quit */
+	bool quitting;
 	/* Reason this server was quit */
 	Anope::string quit_reason;
 
@@ -169,6 +170,11 @@ class CoreExport Server : public Extensible
 	 */
 	bool IsJuped() const;
 
+	/** Check if the server is quitting
+	 * @return true if this server is quitting.
+	 */
+	bool IsQuitting() const;
+
 	/** Send a message to alll users on this server
 	 * @param source The source of the message
 	 * @param message The message

include/service.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -20,7 +20,7 @@
 /** Anything that inherits from this class can be referred to
  * using ServiceReference. Any interfaces provided by modules,
  * such as commands, use this. This is also used for modules
- * that publish a service (m_ssl, etc).
+ * that publish a service (m_ssl_openssl, etc).
  */
 class CoreExport Service : public virtual Base
 {
@@ -148,7 +148,7 @@ class ServiceReference : public Reference<T>
 			 * creates its own service type (that other modules must include the header file
 			 * for), as the core is not compiled with it so there is no RTTI for it.
 			 */
-			this->ref = static_cast<T *>(Service::FindService(this->type, this->name));
+			this->ref = static_cast<T *>(::Service::FindService(this->type, this->name));
 			if (this->ref)
 				this->ref->AddReference(this);
 		}

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/socketengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -41,6 +41,11 @@ class CoreExport SocketEngine
 	/** Read from sockets and do things
 	 */
 	static void Process();
+
+	static int GetLastError();
+	static void SetLastError(int);
+
+	static bool IgnoreErrno();
 };
 
 #endif // SOCKETENGINE_H

include/sockets.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -347,7 +347,7 @@ class CoreExport BinarySocket : public virtual Socket
 
 	/** Write data to the socket
 	 * @param buffer The data to write
-	 * @param l The length of the data
+	 * @param l The length of the data; if 0 then this function returns without doing anything
 	 */
 	virtual void Write(const char *buffer, size_t l);
 	void Write(const char *message, ...);

include/threadengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/timers.h

@@ -1,6 +1,6 @@
 /* Timer include stuff.
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/uplink.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/users.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -92,6 +92,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	/* Last time this user sent an email */
 	time_t lastmail;
 
+ protected:
 	/** Create a new user object, initialising necessary fields and
 	 * adds it to the hash
 	 *
@@ -102,19 +103,20 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	 * @param sip The ip of the user
 	 * @param sserver The server of the user
 	 * @param srealname The realname/gecos of teh user
-	 * @param ssignon User's timestamp
+	 * @param ts User's timestamp
 	 * @param smodes User's modes
 	 * @param suid The unique identifier of the user.
 	 * @param nc The account the user is identified as, if any
 	 */
-	User(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ssignon, const Anope::string &smodes, const Anope::string &suid, NickCore *nc);
+	User(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ts, const Anope::string &smodes, const Anope::string &suid, NickCore *nc);
 
- protected:
 	/** Destroy a user.
 	 */
 	virtual ~User();
 
  public:
+	static User* OnIntroduce(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &svhost, const Anope::string &sip, Server *sserver, const Anope::string &srealname, time_t ts, const Anope::string &smodes, const Anope::string &suid, NickCore *nc);
+
 	/** Update the nickname of a user record accordingly, should be
 	 * called from ircd protocol.
 	 * @param newnick The new username
@@ -323,7 +325,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	/** Check if the user is protected from kicks and negative mode changes
 	 * @return true or false
 	 */
-	bool IsProtected() const;
+	bool IsProtected();
 
 	/** Kill a user
 	 * @param source The user/server doing the kill

include/version.cpp

@@ -1,6 +1,6 @@
 /* Build bumper
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/xline.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2013 Anope Team
+ * (C) 2008-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/bs_autoassign.cpp

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_assign.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_badwords.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -286,7 +286,7 @@ class CommandBSBadwords : public Command
 			return;
 		}
 
-		bool casesensitive = Config->GetModule("botserv")->Get<bool>("casesensitive");
+		bool casesensitive = Config->GetModule(this->module)->Get<bool>("casesensitive");
 
 		for (unsigned i = 0, end = badwords->GetBadWordCount(); i < end; ++i)
 		{

modules/commands/bs_bot.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_botlist.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_control.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_info.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_kick.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2013 Anope Team
+ * (C) 2003-2014 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -104,7 +104,7 @@ struct KickerDataImpl : KickerData
 			for (int i = 0; sep.GetToken(tok) && i < TTB_SIZE; ++i)
 				try
 				{
-					ttb[i] = convertTo<int16_t>(tok);
+					kd->ttb[i] = convertTo<int16_t>(tok);
 				}
 				catch (const ConvertException &) { }
 
@@ -267,6 +267,8 @@ class CommandBSKickAMSG : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		BotInfo *bi = Config->GetClient("BotServ");
 		source.Reply(_("Sets the AMSG kicker on or off. When enabled, the bot will\n"
 				"kick users who send the same message to multiple channels\n"
@@ -302,6 +304,8 @@ class CommandBSKickBadwords : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the bad words kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who say certain words\n"
 				"on the channels.\n"
@@ -338,6 +342,8 @@ class CommandBSKickBolds : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the bolds kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use bolds.\n"
 				" \n"
@@ -427,6 +433,8 @@ class CommandBSKickCaps : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the caps kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who are talking in\n"
 				"CAPS.\n"
@@ -464,6 +472,8 @@ class CommandBSKickColors : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the colors kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use colors.\n"
 				" \n"
@@ -558,6 +568,8 @@ class CommandBSKickFlood : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the flood kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who are flooding\n"
 				"the channel using at least \002ln\002 lines in \002secs\002 seconds\n"
@@ -592,6 +604,8 @@ class CommandBSKickItalics : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the italics kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use italics.\n"
 				" \n"
@@ -621,7 +635,7 @@ class CommandBSKickRepeat : public CommandBSKickBase
 
 		if (params[1].equals_ci("ON"))
 		{
-			const Anope::string &ttb = params[2],
+			const Anope::string &ttb = params.size() > 2 ? params[2] : "",
 						&times = params.size() > 3 ? params[3] : "";
 
 			if (!ttb.empty())
@@ -658,10 +672,10 @@ class CommandBSKickRepeat : public CommandBSKickBase
 			if (kd->ttb[TTB_REPEAT])
 				source.Reply(_("Bot will now kick for \002repeats\002 (users that say the\n"
 						"same thing %d times), and will place a ban after %d\n"
-						"kicks for the same user."), kd->repeattimes, kd->ttb[TTB_REPEAT]);
+						"kicks for the same user."), kd->repeattimes + 1, kd->ttb[TTB_REPEAT]);
 			else
 				source.Reply(_("Bot will now kick for \002repeats\002 (users that say the\n"
-					"same thing %d times)."), kd->repeattimes);
+					"same thing %d times)."), kd->repeattimes + 1);
 		}
 		else if (params[1].equals_ci("OFF"))
 		{
@@ -676,6 +690,8 @@ class CommandBSKickRepeat : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the repeat kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who are repeating\n"
 				"themselves \002num\002 times (if num is not given, it\n"
@@ -710,6 +726,8 @@ class CommandBSKickReverses : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the reverses kicker on or off. When enabled, this\n"
 				"option tells the bot to kick users who use reverses.\n"
 				" \n"
@@ -742,6 +760,8 @@ class CommandBSKickUnderlines : public CommandBSKickBase
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
+		this->SendSyntax(source);
+		source.Reply(" ");
 		source.Reply(_("Sets the underlines kicker on or off. When enabled, this\n"
 			"option tells the bot to kick users who use underlines.\n"
 			" \n"
@@ -1018,8 +1038,8 @@ class BSKick : public Module
 
 	void check_ban(ChannelInfo *ci, User *u, KickerData *kd, int ttbtype)
 	{
-		/* Don't ban ulines */
-		if (u->server->IsULined())
+		/* Don't ban ulines or protected users */
+		if (u->IsProtected())
 			return;
 
 		BanData::Data &bd = this->GetBanData(u, ci->c);
@@ -1045,7 +1065,7 @@ class BSKick : public Module
 		va_list args;
 		char buf[1024];
 
-		if (!ci || !ci->bi || !ci->c || !u || u->server->IsULined() || !ci->c->FindUser(u))
+		if (!ci || !ci->bi || !ci->c || !u || u->IsProtected() || !ci->c->FindUser(u))
 			return;
 
 		Anope::string fmt = Language::Translate(u, message);
@@ -1304,73 +1324,81 @@ class BSKick : public Module
 			Anope::string nbuf = Anope::NormalizeBuffer(realbuf);
 			bool casesensitive = Config->GetModule("botserv")->Get<bool>("casesensitive");
 
-			for (unsigned i = 0; badwords && i < badwords->GetBadWordCount(); ++i)
-			{
-				const BadWord *bw = badwords->GetBadWord(i);
-
-				if (bw->type == BW_ANY && ((casesensitive && nbuf.find(bw->word) != Anope::string::npos) || (!casesensitive && nbuf.find_ci(bw->word) != Anope::string::npos)))
-					mustkick = true;
-				else if (bw->type == BW_SINGLE)
+			/* Normalize can return an empty string if this only conains control codes etc */
+			if (badwords && !nbuf.empty())
+				for (unsigned i = 0; i < badwords->GetBadWordCount(); ++i)
 				{
-					size_t len = bw->word.length();
+					const BadWord *bw = badwords->GetBadWord(i);
 
-					if ((casesensitive && bw->word.equals_cs(nbuf)) || (!casesensitive && bw->word.equals_ci(nbuf)))
+					if (bw->word.empty())
+						continue; // Shouldn't happen
+
+					if (bw->word.length() > nbuf.length())
+						continue; // This can't ever match
+
+					if (bw->type == BW_ANY && ((casesensitive && nbuf.find(bw->word) != Anope::string::npos) || (!casesensitive && nbuf.find_ci(bw->word) != Anope::string::npos)))
 						mustkick = true;
-					else if (nbuf.find(' ') == len && ((casesensitive && bw->word.equals_cs(nbuf)) || (!casesensitive && bw->word.equals_ci(nbuf))))
-						mustkick = true;
-					else
+					else if (bw->type == BW_SINGLE)
 					{
-						if (nbuf.rfind(' ') == nbuf.length() - len - 1 && ((casesensitive && nbuf.find(bw->word) == nbuf.length() - len) || (!casesensitive && nbuf.find_ci(bw->word) == nbuf.length() - len)))
+						size_t len = bw->word.length();
+
+						if ((casesensitive && bw->word.equals_cs(nbuf)) || (!casesensitive && bw->word.equals_ci(nbuf)))
+							mustkick = true;
+						else if (nbuf.find(' ') == len && ((casesensitive && bw->word.equals_cs(nbuf.substr(0, len))) || (!casesensitive && bw->word.equals_ci(nbuf.substr(0, len)))))
 							mustkick = true;
 						else
 						{
-							Anope::string wordbuf = " " + bw->word + " ";
+							if (len < nbuf.length() && nbuf.rfind(' ') == nbuf.length() - len - 1 && ((casesensitive && nbuf.find(bw->word) == nbuf.length() - len) || (!casesensitive && nbuf.find_ci(bw->word) == nbuf.length() - len)))
+								mustkick = true;
+							else
+							{
+								Anope::string wordbuf = " " + bw->word + " ";
+	
+								if ((casesensitive && nbuf.find(wordbuf) != Anope::string::npos) || (!casesensitive && nbuf.find_ci(wordbuf) != Anope::string::npos))
+									mustkick = true;
+							}
+						}
+					}
+					else if (bw->type == BW_START)
+					{
+						size_t len = bw->word.length();
+
+						if ((casesensitive && nbuf.substr(0, len).equals_cs(bw->word)) || (!casesensitive && nbuf.substr(0, len).equals_ci(bw->word)))
+							mustkick = true;
+						else
+						{
+							Anope::string wordbuf = " " + bw->word;
 
 							if ((casesensitive && nbuf.find(wordbuf) != Anope::string::npos) || (!casesensitive && nbuf.find_ci(wordbuf) != Anope::string::npos))
 								mustkick = true;
 						}
 					}
-				}
-				else if (bw->type == BW_START)
-				{
-					size_t len = bw->word.length();
-
-					if ((casesensitive && nbuf.substr(0, len).equals_cs(bw->word)) || (!casesensitive && nbuf.substr(0, len).equals_ci(bw->word)))
-						mustkick = true;
-					else
+					else if (bw->type == BW_END)
 					{
-						Anope::string wordbuf = " " + bw->word;
+						size_t len = bw->word.length();
 
-						if ((casesensitive && nbuf.find(wordbuf) != Anope::string::npos) || (!casesensitive && nbuf.find_ci(wordbuf) != Anope::string::npos))
+						if ((casesensitive && nbuf.substr(nbuf.length() - len).equals_cs(bw->word)) || (!casesensitive && nbuf.substr(nbuf.length() - len).equals_ci(bw->word)))
 							mustkick = true;
-					}
-				}
-				else if (bw->type == BW_END)
-				{
-					size_t len = bw->word.length();
+						else
+						{
+							Anope::string wordbuf = bw->word + " ";
 
-					if ((casesensitive && nbuf.substr(nbuf.length() - len).equals_cs(bw->word)) || (!casesensitive && nbuf.substr(nbuf.length() - len).equals_ci(bw->word)))
-						mustkick = true;
-					else
+							if ((casesensitive && nbuf.find(wordbuf) != Anope::string::npos) || (!casesensitive && nbuf.find_ci(wordbuf) != Anope::string::npos))
+								mustkick = true;
+						}
+					}
+
+					if (mustkick)
 					{
-						Anope::string wordbuf = bw->word + " ";
+						check_ban(ci, u, kd, TTB_BADWORDS);
+						if (Config->GetModule(me)->Get<bool>("gentlebadwordreason"))
+							bot_kick(ci, u, _("Watch your language!"));
+						else
+							bot_kick(ci, u, _("Don't use the word \"%s\" on this channel!"), bw->word.c_str());
 
-						if ((casesensitive && nbuf.find(wordbuf) != Anope::string::npos) || (!casesensitive && nbuf.find_ci(wordbuf) != Anope::string::npos))
-							mustkick = true;
+						return;
 					}
-				}
-
-				if (mustkick)
-				{
-					check_ban(ci, u, kd, TTB_BADWORDS);
-					if (Config->GetModule(me)->Get<bool>("gentlebadwordreason"))
-						bot_kick(ci, u, _("Watch your language!"));
-					else
-						bot_kick(ci, u, _("Don't use the word \"%s\" on this channel!"), bw->word.c_str());
-
-					return;
-				}
-			} /* for */
+				} /* for */
 		} /* if badwords */
 
 		UserData *ud = GetUserData(u, c);