Anope 2.0.5 Release

protocol/inspircd: Match servername as well on ENCAP

CMakeLists.txt

@@ -45,20 +45,20 @@ if(MINOR_VERSION GREATER 5)
   set(CMAKE242_OR_BETTER TRUE)
 else(MINOR_VERSION GREATER 5)
   set(CMAKE26_OR_BETTER FALSE)
-  # Also detect if we are using CMake 2.4.8 or better, the FIND sub-command of list() is non-existent in earlier versions
+  # Also detect if we are using CMake 2.4.8 or better, the FIND sub-command of list() is nonexistent in earlier versions
   if(PATCH_VERSION GREATER 7)
     set(CMAKE248_OR_BETTER TRUE)
     set(CMAKE244_OR_BETTER TRUE)
     set(CMAKE242_OR_BETTER TRUE)
   else(PATCH_VERSION GREATER 7)
     set(CMAKE248_OR_BETTER FALSE)
-    # Also detect if we are using CMake 2.4.4 or better, the CheckCXXCompilerFlag module and SORT sub-command of list() are non-existent in earlier versions
+    # Also detect if we are using CMake 2.4.4 or better, the CheckCXXCompilerFlag module and SORT sub-command of list() are nonexistent in earlier versions
     if(PATCH_VERSION GREATER 3)
       set(CMAKE244_OR_BETTER TRUE)
       set(CMAKE242_OR_BETTER TRUE)
     else(PATCH_VERSION GREATER 3)
       set(CMAKE244_OR_BETTER FALSE)
-      # ALSO detect if we are using CMake 2.4.2 or better, the APPEND sub-command of list() is non-existent in earlier versions
+      # ALSO detect if we are using CMake 2.4.2 or better, the APPEND sub-command of list() is nonexistent in earlier versions
       if(PATCH_VERSION GREATER 1)
         set(CMAKE242_OR_BETTER TRUE)
       else(PATCH_VERSION GREATER 1)

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2016 Anope Team
+# Anope (c) 2003-2017 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -94,6 +94,10 @@ Run_Build_System () {
 	echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $PCH $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR"
 
 	cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $PCH $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR
+	if [ $? -ne 0 ]; then
+		echo "You should fix these issues and then run ./Config -quick to rerun CMake."
+		exit 1
+	fi
 
 	echo ""
 	if [ "$SOURCE_DIR" = "." ] ; then

data/chanserv.example.conf

@@ -1121,9 +1121,6 @@ module
 
 	/* Sets the time to keep seen entries in the seen database. */
 	purgetime = "30d"
-
-	/* Sets the delay between checks for expired seen entries. */
-	expiretimeout = "1d"
 }
 command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; permission = "operserv/seen"; }
 

data/example.conf

@@ -784,12 +784,7 @@ log
  *   chanserv/drop            chanserv/getkey               chanserv/invite
  *   chanserv/list            chanserv/suspend              chanserv/topic
  *
- *   chanserv/saset/bantype   chanserv/saset/description    chanserv/saset/email       chanserv/saset/keepmodes
+ *   chanserv/saset/noexpire
- *   chanserv/saset/founder   chanserv/saset/keeptopic      chanserv/saset/restricted
- *   chanserv/saset/peace     chanserv/saset/persist        chanserv/saset/private
- *   chanserv/saset/secure    chanserv/saset/securefounder  chanserv/saset/secureops
- *   chanserv/saset/signkick  chanserv/saset/successor      chanserv/saset/topiclock
- *   chanserv/saset/url       chanserv/saset/noexpire       chanserv/saset/autoop
  *
  *   memoserv/sendall        memoserv/staff
  *

data/modules.example.conf

@@ -129,7 +129,7 @@ module { name = "help" }
 		 */
 		reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
 
-		/* Replies to ban and their reason. If no relies are configured, all replies get banned. */
+		/* Replies to ban and their reason. If no replies are configured, all replies get banned. */
 		reply
 		{
 			code = 1

docs/Changes

@@ -1,3 +1,21 @@
+Anope Version 2.0.5
+-------------------
+Fix negative levels to not match users with negative access
+Fix memo sender to always be the account name of the sender
+Allow unregistered users to use the ChanServ seen command
+Fix secureops to not be enforced on operators with the chanserv/administration privilege
+Fix command name in HELP syntax messages to always be upper case
+Show unconfirmed nickname messages on registration in webcpanel
+Fix NickServ SET EMAIL to be executable via XMLRPC
+Fix OperServ USERLIST/CHANLIST to accept regexes
+Allow OperServ USERLIST to also match realname syntax (n!u@h#r)
+Fix db_old importing languages to use the UTF-8 version
+Fix m_dns to return REFUSED if no answers could be found
+Fix ns_maxemail to be case insensitive
+Add MemoServ READ ALL command
+Add support for NickServ GROUP to be executed via XMLRPC
+Add support for logging hostname/ip of SASL authentication attempts, if supported by IRCd
+
 Anope Version 2.0.4
 -------------------
 Add notice rpc method to XMLRPC
@@ -88,7 +106,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
 A Added SQL logging support
 A Added Redis database support
@@ -100,7 +118,7 @@ F Fixed setting BotServ's default settings in the config
 F Fixed some names of config items, including NickServ's kill protect
 
 Anope Version 1.9.8
---------------------
+-------------------
 A Ability to configure fantasy commands in the config
 A Add SVSJOIN and SVSPART commands
 F Fix "leave" channel log level from not logging
@@ -112,7 +130,7 @@ F Fix crash in os_forbid with expiring entries
 F Fix several issues with db_sql_live
 
 Anope Version 1.9.7
---------------------
+-------------------
 A Added ability for using regex as patterns for various commands
 A Extended ability of operserv/akill to also match against nick and realname
 A Added chanserv:require configuration option
@@ -122,7 +140,7 @@ A Added a web panel
 A db_sql_live now allows all tables to be "live", not just a select few
 
 Anope Version 1.9.6
---------------------
+-------------------
 A Added ability to configure emails sent by services
 A Added chanserv/up and chanserv/down
 A Added m_proxyscan
@@ -141,7 +159,7 @@ F Fixed crash in /os oper info
 F Fixed eventfd Config check to work properly on OpenVZ
 
 Anope Version 1.9.5
---------------------
+-------------------
 A Extended LDAP support
 A Added os_oper, os_kill, os_forbid, m_statusupdate, cs_sync, and bs_autoassign
 A Added a new configuration file format
@@ -159,7 +177,7 @@ F Fixed setting -P on channels with only a botserv bot in it
 F Fixed modemanager complaining about prefixless modes on InspIRCd
 
 Anope Version 1.9.4
---------------------
+-------------------
 A Automatically set channel founder to the user with the highest access if there is no successor
 A /chanserv clone command to copy settings from one channel to another.
 A /chanserv mode command
@@ -180,7 +198,7 @@ F Some failed logic in /operserv exception that prevents proper exceptions from
 F Fixed the anope_os_sxlines MySQL table and code to work after restarting
 
 Anope Version 1.9.3
---------------------
+-------------------
 A Added italics BotServ kicks support
 A Tell users when their nicks expire in /ns glist and /ns info
 A Added SSL support
@@ -207,7 +225,7 @@ F Anoperc start/stop to send the globaloncycle global, and fixed anoperc rehash
 F Fixed a potential crash if HostServ or BotServ was disbled
 
 Anope Version 1.9.2
---------------------
+-------------------
 A K alias to chanserv kick command
 A KB alias to chanserv ban command
 A The ability to register empty nonregistered channels
@@ -238,7 +256,7 @@ F ms_rsend to really work
 F SQUITing juped servers on InspIRCd1.2+
 
 Anope Version 1.9.1
---------------------
+-------------------
 F Don't enforce akick/forbidden/etc.-restrictions on clients on ulined servers.
 F Remove modules_unload_all fini + hack that goes with it.
 F Signal handling cleanup.
@@ -279,7 +297,7 @@ Provided by Liber <Liber@jasonirc.net> - 2009
 F Support operoverride and such things (stop reversing changes from nonopped people where unnecessary)
 
 Anope Version 1.9.0
---------------------
+-------------------
 F Modified compile to use g++
 F Improve protocol modules support (classes, virtual methods, etc)
 F Move core services to use BotInfo

docs/Changes.conf

@@ -1,3 +1,7 @@
+Anope Version 2.0.5
+-------------------
+No significant changes.
+
 Anope Version 2.0.4
 -------------------
 Removed m_sasl_dh-aes and m_sasl_dh-blowfish
@@ -96,7 +100,7 @@ opertype:commands removed operserv/umode
 operserv:modules removed os_umode
 
 Anope Version 1.9.3
-------------------
+-------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
 nickserv/auspex privilege added
 SSL module added for SSL support
@@ -130,7 +134,7 @@ networkinfo:logchannel, logbot, logusers, logmaxusers, logchannel, and options:k
 dumpcore because it really didn't do anything
 
 Anope Version 1.9.2
---------------------
+-------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
 options:enablelogchannel added to auto turn on the logchannel on startup
 options:mlock added to configure the default mlock modes on new channels

docs/DEFCON

@@ -91,4 +91,3 @@ Anope DefCon
 
     You might get DefCon support by posting on our online forum, or maybe on
     our #anope channel at /server irc.anope.org.
-

docs/EVENTS

@@ -32,4 +32,3 @@ Anope Internal Events
 
     The "anope_override" identifier is for compatibility with C++11.
     Its usage is highly recommended.
-

docs/FAQ

@@ -1,5 +1,5 @@
 Frequently Asked Questions (FAQ) concerning Anope
-------------------------------------------------
+-------------------------------------------------
 
 The information in the 1.9 FAQ is subject to change at any
 moment due to new developments. Please visit our website

docs/NEWS

@@ -4,4 +4,3 @@ Highlighted News in Anope 1.9
 * Added in live updating SQL and the ability to execute commands through SQL
 * Re-designed configuration file
 * Code refresh / rewrite into C++
-

docs/README

@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2016 Anope Team    <team@anope.org>.
+Anope is          2003-2017 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
@@ -111,7 +111,7 @@ Table of Contents
         * Kein <kein-of@yandex.ru> (ru_RU)
         * Maik Funke <Han@mefalcon.org> (de_DE)
         * Isaac Fontal <i_fontal@hotmail.com> (es_ES)
-        * Janos Kapitany <sarkanyka@cjbchat.hu>  (hu_HU)
+        * Janos Kapitany <sarkanyka@cjbchat.hu> (hu_HU)
         * Szymon S'wierkosz <szymek@adres.pl> (pl_PL)
         * Christopher N. <saka@epiknet.org> (fr_FR)
         * Yusuf Kurekci <ysfm.20@gmail.com> (tr_TR)

docs/TOOLS

@@ -20,7 +20,6 @@ Anope Bundled Tools
     address. This should generate a log file of what happened when it tried
     to connect to the SMTP server.
 
-        Credits:
+    Credits:
-    Originally written by  Dominick Meglio    <codemastr@unrealircd.com>
+        Originally written by  Dominick Meglio    <codemastr@unrealircd.com>
-    Ported to *nix by      Trystan Scott Lee  <trystan@nomadirc.net>
+        Ported to *nix by      Trystan Scott Lee  <trystan@nomadirc.net>
-

docs/WIN32.txt

@@ -159,4 +159,3 @@ Anope for Windows
     Anope's Windows Installer was made using:
 
         * NSIS 2.20          <http://nsis.sourceforge.net>
-

docs/XMLRPC/xmlrpc.php

@@ -3,9 +3,10 @@
 /**
  * XMLRPC Functions
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  */
+
 class AnopeXMLRPC
 {
     /**

include/access.h

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

include/account.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/base.h

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

include/bots.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2016 Anope Team <team@anope.org>
+ * (C) 2008-2017 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/channels.h

@@ -1,6 +1,6 @@
 /* Channel support
  *
- * (C) 2008-2016 Anope Team
+ * (C) 2008-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -60,7 +60,7 @@ class CoreExport Channel : public Base, public Extensible
 	Anope::string topic;
 	/* Who set the topic */
 	Anope::string topic_setter;
-	/* The timestamp associated with the topic. Not necessarually anywhere close to Anope::CurTime.
+	/* The timestamp associated with the topic. Not necessarily anywhere close to Anope::CurTime.
 	 * This is the time the topic was *originally set*. When we restore the topic we want to change the TS back
 	 * to this, but we can only do this on certain IRCds.
 	 */

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/defs.h

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

include/extensible.h

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

include/hashcomp.h

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

include/language.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2016 Anope Team
+ * (C) 2008-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/mail.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2016 Anope Team <team@anope.org>
+ * (C) 2008-2017 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/module.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/bs_badwords.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_entrymsg.h

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

include/modules/cs_log.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/dns.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/httpd.h

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

include/modules/ldap.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2016 Anope Team
+ * (C) 2011-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_forbid.h

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

include/modules/os_ignore.h

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

include/modules/os_news.h

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

include/modules/os_session.h

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

include/modules/pseudoclients/chanserv.h

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

include/modules/pseudoclients/global.h

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

include/modules/pseudoclients/memoserv.h

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

include/modules/pseudoclients/nickserv.h

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

include/modules/redis.h

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

include/modules/sasl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2014-2016 Anope Team
+ * (C) 2014-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -46,6 +46,7 @@ namespace SASL
 	{
 		time_t created;
 		Anope::string uid;
+		Anope::string hostname, ip;
 		Reference<Mechanism> mech;
 
 		Session(Mechanism *m, const Anope::string &u) : created(Anope::CurTime), uid(u), mech(m) { }
@@ -76,9 +77,10 @@ namespace SASL
 	class IdentifyRequest : public ::IdentifyRequest
 	{
 		Anope::string uid;
+		Anope::string hostname, ip;
 
 	 public:
-		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass) : ::IdentifyRequest(m, acc, pass), uid(id) { }
+		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass, const Anope::string &h, const Anope::string &i) : ::IdentifyRequest(m, acc, pass), uid(id), hostname(h), ip(i) { }
 
 		void OnSuccess() anope_override
 		{
@@ -86,7 +88,7 @@ namespace SASL
 				return;
 
 			NickAlias *na = NickAlias::Find(GetAccount());
-			if (!na || na->nc->HasExt("NS_SUSPENDED"))
+			if (!na || na->nc->HasExt("NS_SUSPENDED") || na->nc->HasExt("UNCONFIRMED"))
 				return OnFail();
 
 			unsigned int maxlogins = Config->GetModule("ns_identify")->Get<unsigned int>("maxlogins");
@@ -96,7 +98,11 @@ namespace SASL
 			Session *s = sasl->GetSession(uid);
 			if (s)
 			{
-				Log(Config->GetClient("NickServ"), "sasl") << "A user identified to account " << this->GetAccount() << " using SASL";
+				Anope::string user = "A user";
+				if (!hostname.empty() && !ip.empty())
+					user = hostname + " (" + ip + ")";
+
+				Log(Config->GetClient("NickServ"), "sasl") << user << " identified to account " << this->GetAccount() << " using SASL";
 				sasl->Succeed(s, na->nc);
 				delete s;
 			}
@@ -120,8 +126,14 @@ namespace SASL
 				accountstatus = "nonexistent ";
 			else if (na->nc->HasExt("NS_SUSPENDED"))
 				accountstatus = "suspended ";
+			else if (na->nc->HasExt("UNCONFIRMED"))
+				accountstatus = "unconfirmed ";
 
-			Log(Config->GetClient("NickServ"), "sasl") << "A user failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
+			Anope::string user = "A user";
+			if (!hostname.empty() && !ip.empty())
+				user = hostname + " (" + ip + ")";
+
+			Log(Config->GetClient("NickServ"), "sasl") << user << " failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
 		}
 	};
 }

include/modules/set_misc.h

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

include/modules/sql.h

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

include/modules/ssl.h

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

include/modules/suspend.h

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

include/modules/xmlrpc.h

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

include/opertype.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2016 Anope Team <team@anope.org>
+ * (C) 2008-2017 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/protocol.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -196,8 +196,8 @@ class CoreExport IRCDProto : public Service
 	 */
 	virtual void SendConnect() = 0;
 
-	/** Called right before we begin our burst, after we have handshaked successfully with the uplink/
+	/** Called right before we begin our burst, after we have handshaked successfully with the uplink.
-	 * At this point none of our servesr, users, or channels exist on the uplink
+	 * At this point none of our servers, users, or channels exist on the uplink
 	 */
 	virtual void SendBOB() { }
 	virtual void SendEOB() { }

include/regchannel.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2016 Anope Team
+ * (C) 2008-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/service.h

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

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/sockets.h

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

include/threadengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team <team@anope.org>
+ * (C) 2003-2017 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *
@@ -347,10 +347,9 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 
 	/* Returns a mask that will most likely match any address the
 	 * user will have from that location.  For IP addresses, wildcards the
-	 * appropriate subnet mask (e.g. 35.1.1.1 -> 35.*; 128.2.1.1 -> 128.2.*);
+	 * last octet (e.g. 35.1.1.1 -> 35.1.1.*). for named addresses, wildcards
-	 * for named addresses, wildcards the leftmost part of the name unless the
+	 * the leftmost part of the name unless the  name only contains two parts.
-	 * name only contains two parts.  If the username begins with a ~, delete
+	 * If the username begins with a ~, replace with *.
-	 * it.
 	 */
 	Anope::string Mask() const;
 

include/version.cpp

@@ -1,6 +1,6 @@
 /* Build bumper
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2008-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/CMakeLists.txt

@@ -167,4 +167,3 @@ endmacro(build_subdir)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 build_modules(${CMAKE_CURRENT_SOURCE_DIR})
-

modules/bs_autoassign.cpp

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_bot.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 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-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_set.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -114,7 +114,7 @@ class CommandBSSetBanExpire : public Command
 		}
 
 		time_t t = Anope::DoTime(arg);
-		if (t == -1)
+		if (t < 0)
 		{
 			source.Reply(BAD_EXPIRY_TIME);
 			return;

modules/commands/cs_access.cpp

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2016 Anope Team
+ * (C) 2003-2017 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -891,6 +891,19 @@ class CSAccess : public Module
 	{
 		if (group->ci == NULL)
 			return EVENT_CONTINUE;
+
+		const ChanAccess *highest = group->Highest();
+		if (highest && highest->provider == &accessprovider)
+		{
+			/* Access accessprovider is the only accessprovider with the concept of negative access,
+			 * so check they don't have negative access
+			 */
+			const AccessChanAccess *aca = anope_dynamic_static_cast<const AccessChanAccess *>(highest);
+
+			if (aca->level < 0)
+				return EVENT_CONTINUE;
+		}
+
 		/* Special case. Allows a level of -1 to match anyone, and a level of 0 to match anyone identified. */
 		int16_t level = group->ci->GetLevel(priv);
 		if (level == -1)