Anope 1.8.6 Release

This Bug cannot be structurally fixed, needs to be addressed by 3rd party module authors for similar situations. This implementation can serve as a template.

Changes

@@ -1,3 +1,32 @@
+Anope Version 1.8.6
+-------------------
+10/31  A Added support for plexus3's channel mode +z                     [#1202]
+02/23  A Added account tracking support to ratbox protocol module        [  #00]
+03/21  A Added support for Hybrid's m_services and m_change              [  #00]
+03/28  A Added internal events called when a module is loaded/unloaded.  [  #00]
+03/28  A Added internal events called when a command is added/deleted.   [  #00]
+09/11  F Fixed db-convert handling some vhost collisions                 [  #00]
+09/14  F Fixed ./configure failing with partial SQL installations        [  #00]
+09/28  F Fixed ForkForMail to always work                                [  #00]
+09/28  F Fixed /nickserv saset display to use nicktracking if enabled    [#1193]
+09/28  F Fixed /nickserv group to use nicktracking if enabled            [#1194]
+12/12  F Remove vhost requests from nicks that expire                    [  #00]
+12/15  F Fixed /cs enforce #channel to say SET was enforced not (null)   [#1213]
+12/23  F Fixed /cs (un)ban and akick from matching users real hosts/IP   [#1079]
+01/19  F Fixed 'make install' recompiling src/tools                      [#1227]
+01/21  F Fixed many incorrect apostrophe usages                          [#1223]
+01/28  F Fixed not introducing our clients with usermode k on InspIRCd2.0[  #00]
+01/29  F Updated german language file.                                   [  #00]
+02/05  F Fixed wiki URLs in Windows configure script                     [  #00]
+02/11  F Fixed build on Mac                                              [  #00]
+02/23  F Fixed rejoining our clients if they are kicked on a TS6 IRCd    [  #00]
+03/02  F Fixed showing SENDPASS in HELP to users who can't use it        [  #00]
+03/03  F Fixed opping our clients on ratbox when not using TS6           [  #00]
+03/04  F Fixed setting a users host in InspIRCd when vhost is turned off [  #00]
+03/24  F Fixed groups display nick showing in HS req memos for aliases.  [#1252]
+04/28  F Fixed missing NS REGISTER reply when ns_register is not loaded. [#1263]
+05/02  F Fixed crash in enc_md5 on Mac                                   [#1236]
+
 Anope Version 1.8.5
 -------------------
 05/05  A Added an internal event called when a nick is requested         [  #00]
@@ -8,6 +37,7 @@ Anope Version 1.8.5
 05/23  A Added old nick parameter to EVENT_CHANGE_NICK                   [  #00]
 08/13  A Added forking for mail sending on supporting operating systems  [  #00]
 09/05  A Added InspIRCd 2.0 support                                      [  #00]
+10/31  A Added support for Plexus3's channel mode +z                     [#1202]
 04/15  F Fixed os_info to backup its database on Windows                 [  #00]
 04/15  F Fixed a potential crash in cs_clear ops when using UnrealIRCd   [#1154]
 04/16  F Fixed missing TS6SID on FJOIN in inspircd12                     [  #00]
@@ -23,7 +53,7 @@ Anope Version 1.8.5
 09/10  F Fixed pseudo-clients always getting oper on InspIRCd.           [  #00]
 
 Provided by Han` <Han@mefalcon.org> - 2010
-8/14   F Updated german language file.                                   [  #00]
+08/14   F Updated german language file.                                   [  #00]
 
 Anope Version 1.8.4
 -------------------

Changes.conf

@@ -1,3 +1,12 @@
+Anope Version 1.8.6
+-------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+
+** MODIFIED CONFIGURATION DIRECTIVES **
+
+** DELETED  CONFIGURATION DIRECTIVES **
+
+
 Anope Version 1.8.5
 -------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
@@ -9,6 +18,7 @@ Anope Version 1.8.5
 # the use of forking (eg, not Windows).
 #
 
+#ForkForMail
 
 inspircd20 - IRCDModule
 

Changes.lang

@@ -1,3 +1,12 @@
+Anope Version 1.8.6
+-------------------
+*** New Strings:
+
+*** Mod Strings:
+
+*** Del Strings:
+
+
 Anope Version 1.8.5
 -------------------
 *** New Strings:

Changes.mysql

@@ -1,6 +1,9 @@
+Anope Version 1.8.6
+-------------------
+- NONE
+
 Anope Version 1.8.5
 -------------------
-
 - NONE
 
 Anope Version 1.8.4

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2010 Anope team
+# Anope (c) 2003-2011 Anope team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for

Makefile.win32

@@ -1,6 +1,6 @@
 # Makefile for Anope.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for

configure

@@ -3644,6 +3644,7 @@ _ACEOF
 		else
 			CFLAGS="$hold_cflags"
 			LDFLAGS="$hold_ldflags"
+			LIBS=""
 		fi
 	fi
 

configure.in

@@ -1,6 +1,6 @@
 dnl autoconf.in for Services.
 dnl
-dnl Anope (c) 2003-2010 Anope team
+dnl Anope (c) 2003-2011 Anope team
 dnl Contact us at team@anope.org
 
 dnl This program is free but copyrighted software; see the file COPYING for
@@ -123,6 +123,7 @@ int main()
 		else
 			CFLAGS="$hold_cflags"
 			LDFLAGS="$hold_ldflags"
+			LIBS=""
 		fi
 	fi
 ])

docs/EVENTS

@@ -435,3 +435,30 @@ Anope Internal Events
         A user has left the network. This event is emitted before the internal
         removal is performed, so the user still exists internally.
         av[0]  The nickname of the user leaving the network.
+
+    EVENT_MODLOAD
+        A module has been loaded. This event is emitted after the loading
+        sequence has been finished: AnopeInit() has been called and the
+        module has already been added to the modules table.
+        av[0] Name of the loaded module.
+
+    EVENT_MODUNLOAD
+        A module has been unloaded. This event is emitted when the unloading
+        sequence is almost complete: AnopeFini() has been called and all
+        commands, hooks and callbacks have been removed. The module itself
+        is still in memory however.
+        av[0] Name of the unloaded module.
+
+    EVENT_ADDCOMMAND
+        A command hook has been added to anopes command table.
+        Note that the command may have previously existed and merely a new hook
+        was added before or after an existing command hook.
+        av[0] Name of the module adding the command.
+        av[1] Name of the command hook that was added.
+
+    EVENT_DELCOMMAND
+        A command hook has been removed from anopes command table.
+        Note that the command may still exist in anopes command table if other
+        modules have hooks for the same command.
+        av[0] Name of the module deleting the command.
+        av[1] Name of the command hook that was removed.

docs/README

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

include/commands.h

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

include/config.h

@@ -1,9 +1,9 @@
 /* Services configuration.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/datafiles.h

@@ -1,9 +1,9 @@
 /* Database file descriptor structure and file handling routine prototypes.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/defs.h

@@ -1,9 +1,9 @@
 /* Set default values for any constants that should be in include files but
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/depricated.h

@@ -1,9 +1,9 @@
 /* depricated.h
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/encrypt.h

@@ -1,9 +1,9 @@
 /* Include file for high-level encryption routines.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/events.h

@@ -1,9 +1,9 @@
 /* Prototypes and external variable declarations.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 
@@ -64,3 +64,7 @@
 #define EVENT_ACCESS_CLEAR "access_clear"
 #define EVENT_NICK_LOGOUT "nick_logout"
 #define EVENT_CHAN_KICK "chan_kick"
+#define EVENT_MODLOAD "modload"
+#define EVENT_MODUNLOAD "modunload"
+#define EVENT_ADDCOMMAND "addcommand"
+#define EVENT_DELCOMMAND "delcommand"

include/extern.h

@@ -1,9 +1,9 @@
 /* Prototypes and external variable declarations.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 
@@ -56,6 +56,7 @@ E void kill_user(char *source, char *user, char *reason);
 E void bad_password(User * u);
 E void sqline(char *mask, char *reason);
 E void common_unban(ChannelInfo * ci, char *nick);
+E void common_unban_full(ChannelInfo * ci, char *nick, boolean full);
 E void common_svsmode(User * u, char *modes, char *arg);
 
 /**** botserv.c ****/
@@ -154,6 +155,7 @@ E int entry_match_mask(Entry *e, char *mask, uint32 ip);
 E Entry *elist_match(EList *list, char *nick, char *user, char *host, uint32 ip);
 E Entry *elist_match_mask(EList *list, char *mask, uint32 ip);
 E Entry *elist_match_user(EList *list, User *u);
+E Entry *elist_match_user_full(EList *list, User *u, boolean full);
 E Entry *elist_find_mask(EList *list, char *mask);
 E long get_memuse(EList *list);
 
@@ -815,6 +817,7 @@ E void memoserv(User * u, char *buf);
 E void check_memos(User * u);
 E MemoInfo *getmemoinfo(const char *name, int *ischan, int *isforbid);
 E void memo_send(User * u, char *name, char *text, int z);
+E void memo_send_from(User * u, char *name, char *text, int z, char *source);
 E int delmemo(MemoInfo * mi, int num);
 
 /**** messages.c ****/
@@ -1175,6 +1178,7 @@ E int is_excepted(ChannelInfo * ci, User * user);
 E int is_excepted_mask(ChannelInfo * ci, char *mask);
 
 E int match_usermask(const char *mask, User * user);
+E int match_usermask_full(const char *mask, User * user, boolean full);
 E int match_userip(const char *mask, User * user, char *host);
 E void split_usermask(const char *mask, char **nick, char **user,
                       char **host);

include/makefile.win32

@@ -1,6 +1,6 @@
 # Make file for Win32
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.

include/messages.h

@@ -1,9 +1,9 @@
 /* Declarations of IRC message structures, variables, and functions.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/modules.h

@@ -1,9 +1,9 @@
 /* Modular support
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/pseudo.h

@@ -1,9 +1,9 @@
 /* Include extra includes needed by most/all pseudo-clients.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/services.h

@@ -1,9 +1,9 @@
 /*
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 
@@ -324,7 +324,12 @@ struct ircdvars_ {
 	int admin;				/* Has Admin 			*/
 	int chansqline;				/* Supports Channel Sqlines	*/
 	int quitonkill;				/* IRCD sends QUIT when kill	*/
-	int svsmode_unban;			/* svsmode can be used to unban	*/
+	int svsmode_unban;			/* svsmode can be used to unban
+						 * Note the core no longer uses
+						 * this because it can lead to
+						 * users gaining other users IPs.
+						 * It is kept for API compatability.
+						 */
 	int protect;				/* Has protect modes		*/
 	int reversekickcheck;			/* Can reverse ban check	*/
 	int chanreg;				/* channel mode +r for register	*/
@@ -1059,6 +1064,9 @@ typedef struct ignore_data {
 
 struct mailinfo_ {
 	FILE *pipe;
+	/* Used only with mail forking */
+	FILE *writepipe;
+	FILE *readpipe;
 	User *sender;
 	NickCore *recipient;
 	NickRequest *recip;

include/slist.h

@@ -1,9 +1,9 @@
 /* Header for Services list handler.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/sockets.h

@@ -1,9 +1,9 @@
 /*
  *
- * (C) 2004-2010 Anope Team
+ * (C) 2004-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/timeout.h

@@ -1,9 +1,9 @@
 /* Time-delay routine include stuff.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

include/version.sh

@@ -27,7 +27,7 @@ fi
 cat >version.h <<EOF
 /* Version information for Services.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and CREDITS for further details.

include/version.sh.c

@@ -1,9 +1,9 @@
 /* version file handler for win32.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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.
@@ -161,6 +161,8 @@ void write_version(FILE * fd)
     char buf[1024];
     short until_eof = 0;
 
+    if (!fdin)
+        return;
     while (fgets(buf, 1023, fdin)) {
         strip(buf);
 
@@ -173,7 +175,7 @@ void write_version(FILE * fd)
         if (!strcmp(buf, "cat >version.h <<EOF"))
             until_eof = 1;
     }
-
+    fclose(fdin);
 }
 
 void parse_line(FILE * fd, char *line)

install.js

@@ -1,7 +1,7 @@
 //
 // install.js - Windows Configuration
 //
-// (C) 2003-2010 Anope Team
+// (C) 2003-2011 Anope Team
 // Contact us at team@anope.org
 //
 // This program is free but copyrighted software; see the file COPYING for
@@ -328,7 +328,7 @@ var buildPackages = [
         if (!findCompiler()) {
                 WScript.Echo("\nERROR: No suitable build tools were found!");
                 WScript.Echo("Please ensure you have downloaded and installed a version of Visual C++ and/or PlatformSDK.\n");
-                WScript.Echo("For more information on the tools needed to build Anope on Windows, see:\nhttp://anope.info/wiki/Windows#Compiling\n");
+                WScript.Echo("For more information on the tools needed to build Anope on Windows, see:\nhttp://wiki.anope.org/index.php/Windows:1.8#Compiling\n");
         }
         else {
                 WScript.Echo("\nBuild tools were found successfully!\n");
@@ -522,8 +522,7 @@ var buildPackages = [
                 if (noPSDK) {
                         WScript.Echo("Some of the build tools were detected on your computer, but the essential PlatformSDK components were missing.");
                         WScript.Echo("You will need to download the PlatformSDK from the URL below, ensuring that the Core Windows files, and Debugging Tools are installed.");
-                        WScript.Echo("For more details on installing the PlatformSDK, visit http://anope.info/wiki/Windows#Compiling\n");
-                        WScript.Echo("PSDK: http://download.microsoft.com/download/a/5/f/a5f0d781-e201-4ab6-8c6a-9bb4efed1e1a/PSDK-x86.exe\n");                        
+                        WScript.Echo("For more details on installing the PlatformSDK, visit http://wiki.anope.org/index.php/Windows:1.8#Compiling\n");
                 }
                 return false;
         }

lang/cat.l

@@ -1,9 +1,9 @@
 # Catalan Language File.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# 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. 
@@ -3287,7 +3287,7 @@ OPER_HELP_DEFCON
 	Syntax: DEFCON [1|2|3|4|5]
 
 	The defcon system can be used to implement a pre-defined
-	set of restrictions to services useful during an attemtped
+	set of restrictions to services useful during an attempted
 	attack on the network.
 
 OPER_HELP_DEFCON_NO_NEW_CHANNELS
@@ -6765,9 +6765,9 @@ HOST_NO_VIDENT
 #
 ###########################################################################
 HOST_GROUP
-	All vhost's in the group %s have been set to %s
+	All vhosts in the group %s have been set to %s
 HOST_IDENT_GROUP
-	All vhost's in the group %s have been set to %s@%s
+	All vhosts in the group %s have been set to %s@%s
 
 ###########################################################################
 #

lang/de.l

@@ -1,9 +1,9 @@
 # Deutsches Language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #   
-# Please read COPYING and README for furhter details.
+# 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. 
@@ -12,7 +12,7 @@
 # - Solltest du irgendwelche Rechtschreibfehler oder sonstige
 #   Verbesserungsvorschläge haben, immer her damit!
 #
-# INFO ::: Letzte Änderung:	08.08.2009	-- Han` -- Han@mefalcon.org --
+# INFO ::: Letzte Änderung:	29.01.2011	-- Han` -- Han@mefalcon.org --
 #
 ##########################################################################
 #
@@ -856,7 +856,7 @@ NICK_GLIST_FOOTER
 NICK_GLIST_REPLY
 	   %c%s
 NICK_GLIST_REPLY_ADMIN
-	   %c%s (wird in %s auslaufen)
+	   %c%s (wird am %s auslaufen)
 
 # RECOVER responses
 NICK_RECOVER_SYNTAX
@@ -4344,7 +4344,7 @@ CHAN_HELP_CMD_CLEAR
 	    CLEAR      Entfernt bestimmte Einstellungen des angegebenen Channel
 CHAN_HELP_CMD_DEVOICE
 	    DEVOICE    Enfernt den Voice-Status des angegebenen Nicknamens
-	               in einen Channel
+	               in einem Channel
 CHAN_HELP_CMD_GETKEY
 	    GETKEY     Gibt das Channel-Passwort wieder
 CHAN_HELP_CMD_INFO
@@ -4354,43 +4354,43 @@ CHAN_HELP_CMD_INVITE
 CHAN_HELP_CMD_KICK
 	    KICK       Kickt den angegebenen Nicknamen aus einen Channel
 CHAN_HELP_CMD_LIST
-	    LIST       Listet alle registrieten Channels des angegebene Muster
+	    LIST       Listet alle registrierten Channels des angegebene Muster
 CHAN_HELP_CMD_LOGOUT
-	    LOGOUT     Das Befehl wir den angegegenen Nickname abmelden
+	    LOGOUT     Meldet den angegebenen Nicknamen ab
 CHAN_HELP_CMD_OP
-	    OP         Gibt den angegebenen Nicknamen Op-Status in einen Channel
+	    OP         Gibt dem angegebenen Nicknamen Op-Status in einem Channel
 CHAN_HELP_CMD_TOPIC
 	    TOPIC      Ändert den Topic des angegebenen Channels
 CHAN_HELP_CMD_UNBAN
-	    UNBAN      Enfernt den oder die ban(s) die dich betreffen aus einen Channel
+	    UNBAN      Enfernt den oder die Bann(s) die Dich betreffen aus einem Channel
 CHAN_HELP_CMD_VOICE
-	    VOICE      Gibt den angegebenen User Voice-Status in einen Channel
+	    VOICE      Gibt dem angegebenen User Voice-Status in einem Channel
 CHAN_HELP_CMD_VOP
-	    VOP        Verwaltet die VOP-Liste von einen Channel
+	    VOP        Verwaltet die VOP-Liste eines Channels
 CHAN_HELP_CMD_DEHALFOP
 	    DEHALFOP   Enfernt den HalfOP-Status des angegebenen Nicknamens
-	               in einen Channel
+	               in einem Channel
 CHAN_HELP_CMD_DEOWNER
-	    DEOWNER    Entfernt dein Founder (Gründer) Status in einen Channel
+	    DEOWNER    Entfernt Deinen Founder (Gründer) Status in einem Channel
 CHAN_HELP_CMD_DEPROTECT
-	    DEPROTECT  Entfernt den schutz des angegebenen Nicknamens 
-	               in einen Channel
+	    DEPROTECT  Entfernt den Schutz des angegebenen Nicknamens 
+	               in einem Channel
 CHAN_HELP_CMD_HALFOP
-	    HALFOP     Gibt den angegebenen User HalfOP-Status in einen Channel
+	    HALFOP     Gibt dem angegebenen User HalfOP-Status in einem Channel
 CHAN_HELP_CMD_HOP
 	    HOP        Verwaltet die HOP-Liste von einen Channel
 CHAN_HELP_CMD_OWNER
-	    OWNER      Gibt dir Founder (Gründer) Staus in einen Channel
+	    OWNER      Gibt Dir Founder (Gründer) Status in einem Channel
 CHAN_HELP_CMD_PROTECT
-	    PROTECT    Schützt den angegebenen Nicknamen in einen Channel
+	    PROTECT    Schützt den angegebenen Nicknamen in einem Channel
 CHAN_HELP_CMD_ADMIN
-	    ADMIN      Schützt den angegebenen Nicknamen in einen Channel
+	    ADMIN      Schützt den angegebenen Nicknamen in einem Channel
 CHAN_HELP_CMD_DEADMIN
 	    DEADMIN    Entfernt den Schutz des angegebenen Nicknamens 
-	               in einen Channel
+	               in einem Channel
 CHAN_HELP_CMD_DEOP
 	    DEOP       Enfernt den OP-Status des angegebenen Nicknamens
-	               in einen Channel
+	               in einem Channel
 
 CHAN_HELP
 	Mit Hilfe von %S kann man Channel registrieren und
@@ -6354,20 +6354,20 @@ BOT_HELP_CMD_BADWORDS
 BOT_HELP_CMD_ACT
 	    ACT           Veranlaßt den Bot ein "/me" Befehl ausführen
 BOT_HELP_CMD_INFO
-	    INFO          Erlaubt dir Informationen über ein BotServ ServicesBot zu sehen
+	    INFO          Erlaubt Dir, Informationen über einen ServicesBot anzuzeigen
 BOT_HELP_CMD_SAY
-	    SAY           Veranlaßt ein Bot ein Text in einen Channel zu sagen
+	    SAY           Veranlaßt den Bot etwas in einem Channel zu sagen
 BOT_HELP_CMD_UNASSIGN
-	    UNASSIGN      Entfernt ein ServicesBot von einen Channel
+	    UNASSIGN      Entfernt ein ServicesBot von einem Channel
 BOT_HELP_CMD_BOT
 	    BOT           Verwaltung von Bots
 
 BOT_HELP
-	%S ist dafür geschaffen, Bots in Channels 
+	%S ist dafür geschaffen, Bots in Channels
 	einzubringen. Geschaffen wurde er für User, die
 	selbst keinen Bot ausfetzen können, oder auch Netzwerke,
-	die Bots verbieten. Mögliche Befehle siehe unten, 
-	die Syntax ist %R%S Befehl.  
+	die Bots verbieten. Mögliche Befehle siehe unten,
+	die Syntax ist %R%S Befehl.
 	
 	Für weitere Hilfe zu einem bestimmten Befehl
 	tippe %R%S HELP Befehl

lang/en_us.l

@@ -1,6 +1,6 @@
 # United States English language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #   
 # Please read COPYING and README for further details.
@@ -6390,9 +6390,9 @@ HOST_OFF_UNREAL
 HOST_NO_VIDENT
 	Your IRCD does not support vIdent's, if this is incorrect, please report this as a possible bug
 HOST_GROUP
-	All vhost's in the group %s have been set to %s
+	All vhosts in the group %s have been set to %s
 HOST_IDENT_GROUP
-	All vhost's in the group %s have been set to %s@%s
+	All vhosts in the group %s have been set to %s@%s
 HOST_LIST_FOOTER
 	Displayed all records (Count: %d)
 HOST_LIST_RANGE_FOOTER

lang/es.l

@@ -1,9 +1,9 @@
 # Spanish Language File.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# 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.

lang/fr.l

@@ -1,9 +1,9 @@
 # French language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# 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.
@@ -4652,7 +4652,7 @@ CHAN_HELP_SET_RESTRICTED
 CHAN_HELP_SET_SECURE
 	Syntaxe: SET canal SECURE {ON | OFF}
 	
-	Active ou désactive les caractéristiques de sécurité de %s pour 
+	Active ou désactive les caractéristiques de sécurité de %S pour 
 	un canal. Lorsque la Sécurité est active, seuls les 
 	utilisateurs qui ont enregistré leurs pseudos avec %s et qui sont 
 	identifiés avec leur mot de passe auront accès au canal sous 

lang/gr.l

@@ -1,9 +1,9 @@
 # Greek language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# 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.
@@ -3279,7 +3279,7 @@ OPER_HELP_DEFCON
 	Syntax: DEFCON [1|2|3|4|5]
 
 	The defcon system can be used to implement a pre-defined
-	set of restrictions to services useful during an attemtped
+	set of restrictions to services useful during an attempted
 	attack on the network.
 
 OPER_HELP_DEFCON_NO_NEW_CHANNELS
@@ -6651,9 +6651,9 @@ HOST_NO_VIDENT
 #
 ###########################################################################
 HOST_GROUP
-	All vhost's in the group %s have been set to %s
+	All vhosts in the group %s have been set to %s
 HOST_IDENT_GROUP
-	All vhost's in the group %s have been set to %s@%s
+	All vhosts in the group %s have been set to %s@%s
 
 ###########################################################################
 #

lang/hun.l

@@ -1,6 +1,6 @@
 # Hungarian (magyar) language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #    
 # Translated by:                                      
@@ -9,7 +9,7 @@
 # CJB CHAT Magyarország, http://cjbchat.hu     
 # Ez a fordítás a CJB Chat megrendelésére készült. 
 #
-# Please read COPYING and README for furhter details.
+# 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. 

lang/it.l

@@ -1,6 +1,6 @@
 # Italian language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.

lang/langcomp.c

@@ -1,6 +1,6 @@
 /* Compiler for language definition files.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -77,10 +77,12 @@ int read_index_file()
 	numstrings++;
     if (!(stringnames = calloc(sizeof(char *), numstrings))) {
 	perror("calloc(stringnames)");
+	fclose(f);
 	return -1;
     }
     if (!(strings = calloc(sizeof(char *), numstrings))) {
 	perror("calloc(strings)");
+	fclose(f);
 	return -1;
     }
     fseek(f, 0, SEEK_SET);
@@ -90,6 +92,7 @@ int read_index_file()
 	    buf[strlen(buf)-1] = '\0';
 	if (!(stringnames[i++] = anopeStrDup(buf))) {
 	    perror("strdup()");
+	    fclose(f);
 	    return -1;
 	}
     }
@@ -201,6 +204,7 @@ int main(int ac, char **av)
     }
     if (!(out = fopen(outfile, "wb"))) {
 	perror(outfile);
+	fclose(in);
 	return 1;
     }
 

lang/langtool.c

@@ -1,9 +1,9 @@
 /* Language stuff generator for win32.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
- * Please read COPYING and README for furhter details.
+ * 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. 

lang/nl.l

@@ -1,9 +1,9 @@
 # Dutch Language File
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# 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.
@@ -6569,9 +6569,9 @@ HOST_OFF_UNREAL
 HOST_NO_VIDENT
 	Je IRCD ondersteunt geen vIdent's. Als dit niet klopt, rapporteer dit dan als een mogelijke bug
 HOST_GROUP
-	Alle vhost's in de groep %s zijn ingesteld op %s
+	Alle vhosts in de groep %s zijn ingesteld op %s
 HOST_IDENT_GROUP
-	Alle vhost's in de groep %s zijn ingesteld op %s@%s
+	Alle vhosts in de groep %s zijn ingesteld op %s@%s
 
 ###########################################################################
 #

lang/pl.l

@@ -14,7 +14,7 @@
 #
 ###########################################################################
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #   
 # Please read COPYING and README for further details.

lang/pt.l

@@ -1,9 +1,9 @@
 # Portuguese language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# 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.
@@ -6535,9 +6535,9 @@ HOST_OFF_UNREAL
 HOST_NO_VIDENT
 	Seu IRCD não suporta vIdent's, se isto não está certo, por favor reporte isso como um possível bug.
 HOST_GROUP
-	Todos os vhost's no grupo %s foram ajustados para %s
+	Todos os vhosts no grupo %s foram ajustados para %s
 HOST_IDENT_GROUP
-	Todos os vhost's no grupo %s foram ajustados para %s@%s
+	Todos os vhosts no grupo %s foram ajustados para %s@%s
 HOST_LIST_FOOTER
 	Exibidos todos os registros (Contador: %d)
 HOST_LIST_RANGE_FOOTER

lang/ru.l

@@ -1,6 +1,6 @@
 # Russian language file for Anope
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.

lang/tr.l

@@ -1,9 +1,9 @@
 # Turkish language file.
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
-# Please read COPYING and README for furhter details.
+# 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.

src/actions.c

@@ -1,6 +1,6 @@
 /* Various routines to perform simple actions.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -125,9 +125,10 @@ void sqline(char *mask, char *reason)
  * Unban the nick from a channel
  * @param ci channel info for the channel
  * @param nick to remove the ban for
+ * @param full True to match against realhost
  * @return void
  */
-void common_unban(ChannelInfo * ci, char *nick)
+static void _common_unban(ChannelInfo * ci, char *nick, boolean full)
 {
     char *av[4];
     char *host = NULL;
@@ -162,47 +163,59 @@ void common_unban(ChannelInfo * ci, char *nick)
     if (host)
         ip = str_is_ip(host);
 
-    if (ircd->svsmode_unban) {
-        anope_cmd_unban(ci->name, nick);
+    if (ircdcap->tsmode) {
+        snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
+        av[0] = ci->name;
+        av[1] = buf;
+        av[2] = sstrdup("-b");
+        ac = 4;
     } else {
-        if (ircdcap->tsmode) {
-            snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
-            av[0] = ci->name;
-            av[1] = buf;
-            av[2] = sstrdup("-b");
-            ac = 4;
-        } else {
-            av[0] = ci->name;
-            av[1] = sstrdup("-b");
-            ac = 3;
-        }
-
-        for (ban = ci->c->bans->entries; ban; ban = next) {
-            next = ban->next;
-            if (entry_match(ban, u->nick, u->username, u->host, ip) ||
-                entry_match(ban, u->nick, u->username, u->vhost, ip) ||
-                entry_match(ban, u->nick, u->username, u->chost, ip)) {
-                anope_cmd_mode(whosends(ci), ci->name, "-b %s", ban->mask);
-                if (ircdcap->tsmode)
-                    av[3] = ban->mask;
-                else
-                    av[2] = ban->mask;
-
-                do_cmode(whosends(ci), ac, av);
-            }
-        }
-
-        if (ircdcap->tsmode)
-            free(av[2]);
-        else
-            free(av[1]);
+        av[0] = ci->name;
+        av[1] = sstrdup("-b");
+        ac = 3;
     }
+
+    for (ban = ci->c->bans->entries; ban; ban = next) {
+        next = ban->next;
+        if ((full && entry_match(ban, u->nick, u->username, u->host, ip)) ||
+            entry_match(ban, u->nick, u->username, u->vhost, 0) ||
+            entry_match(ban, u->nick, u->username, u->chost, 0)) {
+            anope_cmd_mode(whosends(ci), ci->name, "-b %s", ban->mask);
+            if (ircdcap->tsmode)
+                av[3] = sstrdup(ban->mask);
+            else
+                av[2] = sstrdup(ban->mask);
+
+            do_cmode(whosends(ci), ac, av);
+
+            if (ircdcap->tsmode)
+                free(av[3]);
+            else
+                free(av[2]);
+        }
+    }
+
+    if (ircdcap->tsmode)
+        free(av[2]);
+    else
+        free(av[1]);
+
     /* host_resolve() sstrdup us this info so we gotta free it */
     if (host) {
         free(host);
     }
 }
 
+void common_unban(ChannelInfo * ci, char *nick)
+{
+	_common_unban(ci, nick, false);
+}
+
+void common_unban_full(ChannelInfo * ci, char *nick, boolean full)
+{
+	_common_unban(ci, nick, full);
+}
+
 /*************************************************************************/
 
 /**

src/base64.c

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

src/bin/anoperc.in

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services
 #
-# (C) 2003-2010 Anope Team
+# (C) 2003-2011 Anope Team
 # Contact us at team@anope.org
 #
 # Please read COPYING and README for further details.

src/botserv.c

@@ -1,6 +1,6 @@
 /* BotServ functions
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -789,11 +789,16 @@ void bot_join(ChannelInfo * ci)
                     anope_cmd_mode(whosends(ci), ci->name, "-b %s",
                                    ban->mask);
                     if (ircdcap->tsmode)
-                        av[3] = ban->mask;
+                        av[3] = sstrdup(ban->mask);
                     else
-                        av[2] = ban->mask;
+                        av[2] = sstrdup(ban->mask);
 
                     do_cmode(whosends(ci), ac, av);
+
+                    if (ircdcap->tsmode)
+                        free(av[3]);
+                    else
+                        free(av[2]);
                 }
             }
 

src/channels.c

@@ -1,6 +1,6 @@
 /* Channel-handling routines.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -640,6 +640,7 @@ void do_kick(const char *source, int ac, char **av)
     User *user;
     char *s, *t;
     struct u_chanlist *c;
+    Uid *uid;
 
     t = av[1];
     while (*(s = t)) {
@@ -647,6 +648,13 @@ void do_kick(const char *source, int ac, char **av)
         if (*t)
             *t++ = 0;
 
+	if (ircd->ts6 && UseTS6)
+	{
+		uid = find_nickuid(s);
+		if (uid)
+			s = uid->nick;
+	}
+
         /* If it is the bot that is being kicked, we make it rejoin the
          * channel and stop immediately.
          *      --lara
@@ -2386,11 +2394,12 @@ Entry *elist_match_mask(EList * list, char *mask, uint32 ip)
  * Check if a user matches an entry on a list.
  * @param list EntryList that should be matched against
  * @param user The user to match against the entries
+ * @param full true to match against real host and real IP
  * @return Returns the first matching entry, if none, NULL is returned.
  */
-Entry *elist_match_user(EList * list, User * u)
+static Entry *_elist_match_user(EList * list, User * u, boolean full)
 {
-    Entry *res;
+    Entry *res = NULL;
     char *host;
     uint32 ip = 0;
 
@@ -2413,11 +2422,12 @@ Entry *elist_match_user(EList * list, User * u)
         ip = str_is_ip(host);
 
     /* Match what we ve got against the lists.. */
-    res = elist_match(list, u->nick, u->username, u->host, ip);
+    if (full)
+        res = elist_match(list, u->nick, u->username, u->host, ip);
     if (!res)
-        res = elist_match(list, u->nick, u->username, u->vhost, ip);
+        res = elist_match(list, u->nick, u->username, u->vhost, 0);
     if (!res)
-        res = elist_match(list, u->nick, u->username, u->chost, ip);
+        res = elist_match(list, u->nick, u->username, u->chost, 0);
 
     if (host)
         free(host);
@@ -2425,6 +2435,16 @@ Entry *elist_match_user(EList * list, User * u)
     return res;
 }
 
+Entry *elist_match_user(EList *list, User *u)
+{
+	return _elist_match_user(list, u, false);
+}
+
+Entry *elist_match_user_full(EList *list, User *u, boolean full)
+{
+	return _elist_match_user(list, u, full);
+}
+
 /**
  * Find a entry identical to the given mask..
  * @param list EntryList that should be matched against

src/chanserv.c

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

src/commands.c

@@ -1,6 +1,6 @@
 /* Routines for looking up commands in a *Serv command list.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

src/compat.c

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

src/config.c

@@ -1,6 +1,6 @@
 /* Configuration file handling.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -926,7 +926,9 @@ int read_config(int reload)
                 perror("Can't open " SERVICES_CONF);
             else
                 alog("Can't open %s", SERVICES_CONF);
+#ifndef NOT_MAIN
         }
+#endif
         return 0;
     }
     while (fgets(buf, sizeof(buf), config)) {
@@ -1246,7 +1248,7 @@ int read_config(int reload)
             if (s) {
                 RootNumber++;
                 ServicesRoots =
-                    realloc(ServicesRoots, sizeof(char *) * RootNumber);
+                    srealloc(ServicesRoots, sizeof(char *) * RootNumber);
                 ServicesRoots[RootNumber - 1] = sstrdup(s);
             }
         } while ((s = strtok(NULL, " ")));
@@ -1266,7 +1268,7 @@ int read_config(int reload)
         do {
             if (s) {
                 NumUlines++;
-                Ulines = realloc(Ulines, sizeof(char *) * NumUlines);
+                Ulines = srealloc(Ulines, sizeof(char *) * NumUlines);
                 Ulines[NumUlines - 1] = sstrdup(s);
             }
         } while ((s = strtok(NULL, " ")));

src/core/bs_act.c

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

src/core/bs_assign.c

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

src/core/bs_badwords.c

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

src/core/bs_bot.c

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

src/core/bs_botlist.c

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

src/core/bs_fantasy.c

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

src/core/bs_fantasy_kick.c

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

src/core/bs_fantasy_kickban.c

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

src/core/bs_fantasy_owner.c

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

src/core/bs_fantasy_seen.c

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

src/core/bs_help.c

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

src/core/bs_info.c

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

src/core/bs_kick.c

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

src/core/bs_say.c

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

src/core/bs_set.c

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

src/core/bs_unassign.c

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

src/core/cs_access.c

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

src/core/cs_akick.c

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

src/core/cs_ban.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -219,7 +219,7 @@ int do_unban(User * u)
     } else if (!check_access(u, ci, CA_UNBAN)) {
         notice_lang(s_ChanServ, u, PERMISSION_DENIED);
     } else {
-        common_unban(ci, u->nick);
+        common_unban_full(ci, u->nick, true);
         notice_lang(s_ChanServ, u, CHAN_UNBANNED, chan);
     }
     return MOD_CONT;

src/core/cs_clear.c

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

src/core/cs_drop.c

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

src/core/cs_forbid.c

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

src/core/cs_getkey.c

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

src/core/cs_getpass.c

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

src/core/cs_help.c

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

src/core/cs_identify.c

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

src/core/cs_info.c

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

src/core/cs_invite.c

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

src/core/cs_kick.c

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

src/core/cs_list.c

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

src/core/cs_logout.c

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

src/core/cs_modes.c

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

src/core/cs_register.c

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

src/core/cs_sendpass.c

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -60,7 +60,8 @@ void AnopeFini(void)
  **/
 void myChanServHelp(User * u)
 {
-    notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
+    if (!RestrictMail || is_services_oper(u))
+        notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
 }
 
 /**

src/core/cs_set.c

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

src/core/cs_status.c

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

src/core/cs_suspend.c

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

src/core/cs_topic.c

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

src/core/cs_xop.c

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

src/core/enc_md5.c

@@ -1,7 +1,7 @@
 /* Module for encryption using MD5.
  *
  * Modified for Anope.
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Taken from IRC Services and is copyright (c) 1996-2002 Andrew Church.
@@ -73,7 +73,7 @@ typedef void *POINTER;
 #define S43 15
 #define S44 21
 
-void MD5Transform (UINT4 [4], unsigned char [64]);
+void Ano_MD5Transform (UINT4 [4], unsigned char [64]);
 void Encode (unsigned char *, UINT4 *, unsigned int);
 void Decode (UINT4 *, unsigned char *, unsigned int);
 
@@ -120,7 +120,7 @@ Rotation is separate from addition to prevent recomputation.
 
 /* MD5 initialization. Begins an MD5 operation, writing a new context.
  */
-void MD5Init (context)
+void Ano_MD5Init (context)
 MD5_CTX *context;                                        /* context */
 {
   context->count[0] = context->count[1] = 0;
@@ -136,7 +136,7 @@ MD5_CTX *context;                                        /* context */
   operation, processing another message block, and updating the
   context.
  */
-void MD5Update (context, input, inputLen)
+void Ano_MD5Update (context, input, inputLen)
 MD5_CTX *context;                                        /* context */
 unsigned char *input;                                /* input block */
 unsigned int inputLen;                     /* length of input block */
@@ -159,10 +159,10 @@ unsigned int inputLen;                     /* length of input block */
   if (inputLen >= partLen) {
  memcpy
    ((POINTER)&context->buffer[index], (POINTER)input, partLen);
- MD5Transform (context->state, context->buffer);
+ Ano_MD5Transform (context->state, context->buffer);
 
  for (i = partLen; i + 63 < inputLen; i += 64)
-   MD5Transform (context->state, &input[i]);
+   Ano_MD5Transform (context->state, &input[i]);
 
  index = 0;
   }
@@ -178,7 +178,7 @@ unsigned int inputLen;                     /* length of input block */
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
   the message digest and zeroizing the context.
  */
-void MD5Final (digest, context)
+void Ano_MD5Final (digest, context)
 unsigned char digest[16];                         /* message digest */
 MD5_CTX *context;                                       /* context */
 {
@@ -192,10 +192,10 @@ MD5_CTX *context;                                       /* context */
 */
   index = (unsigned int)((context->count[0] >> 3) & 0x3f);
   padLen = (index < 56) ? (56 - index) : (120 - index);
-  MD5Update (context, PADDING, padLen);
+  Ano_MD5Update (context, PADDING, padLen);
 
   /* Append length (before padding) */
-  MD5Update (context, bits, 8);
+  Ano_MD5Update (context, bits, 8);
   /* Store state in digest */
   Encode (digest, context->state, 16);
 
@@ -206,7 +206,7 @@ MD5_CTX *context;                                       /* context */
 
 /* MD5 basic transformation. Transforms state based on block.
  */
-void MD5Transform (state, block)
+void Ano_MD5Transform (state, block)
 UINT4 state[4];
 unsigned char block[64];
 {
@@ -343,13 +343,13 @@ int md5_encrypt(const char *src, int len, char *dest, int size)
     if (size < 16)
 	return -1;
 
-    MD5Init(&context);
-    MD5Update(&context, src, len);
-    MD5Final(dest, &context);
+    Ano_MD5Init(&context);
+    Ano_MD5Update(&context, src, len);
+    Ano_MD5Final(dest, &context);
     
     if(debug) {
         memset(tmp,0,33);
-        binary_to_hex(dest,tmp,16);
+        binary_to_hex((unsigned char *) dest,tmp,16);
 	/* Dont log source if we were encrypting in place :) */
         if (memcmp(src, dest, 16) != 0) {
             alog("enc_md5: hashed from [%s] to [%s]",src,tmp); 

src/core/enc_none.c

@@ -1,6 +1,6 @@
 /* Module for encryption using MD5.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * This program is free but copyrighted software; see the file COPYING for

src/core/enc_old.c

@@ -1,6 +1,6 @@
 /* Include file for high-level encryption routines.
  *
- * (C) 2003-2010 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

src/core/he_help.c

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

src/core/hs_del.c

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

src/core/hs_delall.c

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

src/core/hs_group.c

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

src/core/hs_help.c

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