From 32d7c5ff65918d5510a9e0a5dccfff1592c5e020 Mon Sep 17 00:00:00 2001
From: "mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b"
 <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Sun, 17 Aug 2008 14:43:16 +0000
Subject: [PATCH] BUILD : 1.7.21 (1415) BUGS : 905 NOTES : Applied patch by
 Viper to add missing config file changes in Changes.conf

git-svn-id: svn://svn.anope.org/anope/trunk@1415 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1130 5417fbe8-f217-4b02-8779-1006273d7864
---
 Changes      |  5 ++--
 Changes.conf | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 version.log  |  6 ++++-
 3 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index 356bf9408..0530d64af 100644
--- a/Changes
+++ b/Changes
@@ -66,14 +66,15 @@ Provided by Johno Crawford <johno.crawford@gmail.com> - 2008
 02/08 F x86_64 generating improper SHA1 hash values.                      [#856]
 
 Provided by Jan Milants <jan_renee@msn.com> - 2008
+01/16 F Server traversion with next_server() failed to list all servers.  [#831]
+02/08 F Removed excessive free in ChanServ AKICK code.                    [#849]
 07/20 F make install now runs install routine for modules subdirs also.   [#917]
 07/20 F Fixes weird hs_setall behaviour (memory issues).                  [#916]
 07/20 F DEFCON was akilling ulined servers clients.                       [#899]
 07/20 F Botserv replying with /(null).                                    [#894]
 07/20 F Anope will not limit sessions for ulined servers.                 [#909]
 07/20 F EVENT_BOT_KICK not being send under all circumstances             [#910]
-01/16 F Server traversion with next_server() failed to list all servers.  [#831]
-02/08 F Removed excessive free in ChanServ AKICK code.                    [#849]
+08/17 F Changes.conf updated with forgotten deleted directives.           [#905]
 
 Provided by Martin J. Green <mail@martinjgreen.me.uk> - 2008
 08/17 A SQLINE and SGLINE support for Hybrid.                             [#887]
diff --git a/Changes.conf b/Changes.conf
index 21c09a37a..7989a2d19 100644
--- a/Changes.conf
+++ b/Changes.conf
@@ -111,6 +111,22 @@ NSDefAutoop
 ** MODIFIED CONFIGURATION DIRECTIVES **
 ModuleDelayedAutoload "cs_appendtopic cs_enforce ns_maxemail os_info hs_request"
 
+# LimitSessions  [OPTIONAL]
+#     Enables session limiting. Session limiting prevents users from 
+#     connecting more than a certain number of times from the same host at the
+#     same time - thus preventing most types of cloning. Once a host reaches 
+#     it's session limit, all clients attempting to connect from that host 
+#     will be killed. Exceptions to the default session limit, which are based 
+#     on host names, can be defined via the exception list. It should be noted
+#     that session limiting, along with a large exception list, can degrade
+#     services' performance. See the source and comments in sessions.c and the
+#     online help for more information about session limiting.
+#
+#     NOTE:  This option is not available when STREAMLINED is defined in
+#     the Makefile.
+
+LimitSessions
+
 ** DELETED  CONFIGURATION DIRECTIVES ** 
 # NSAutoOPDBName [OPTIONAL]
 # Module: ns_noop
@@ -120,6 +136,59 @@ ModuleDelayedAutoload "cs_appendtopic cs_enforce ns_maxemail os_info hs_request"
 #
 #NSAutoOPDBName "autoop.db"
 
+# KillClonesAkillExpire <time>  [REQUIRED]
+#     Sets the expiry time for autokills added for hosts that have been
+#     killed using the KILLCLONES command.
+
+KillClonesAkillExpire   30m
+
+# CheckClones <minusers> <maxdelay> <warningdelay>  [DEPRECATED]
+#     Causes Services to try and detect "clones" connecting to the network.
+#     A WALLOPS (or GOPER, if supported on the IRC server) will be sent if
+#     Services thinks it has found clones.
+#
+#     This feature has been superseded by Session Limiting.
+#
+#     <minusers> sets the minimum number of users which must successively
+#     connect to the network before Services will send a clone warning.
+#
+#     <maxdelay> sets the maximum time that can elapse between successive
+#     users before Services decides they are not clones.
+#
+#     <warningdelay> sets the minimum time between clone warnings for
+#     clones from the same host.
+#
+#     NOTE:  This option is not available when STREAMLINED is defined in
+#     the Makefile.
+
+# CheckClones   5 10s 30s
+
+# KillClones [DISCOURAGED]  [DEPRECATED]
+#     Causes Services to kill users which trigger the clone warnings.  (If
+#     CheckClones is disabled, this will have no effect.)
+#
+#     This feature has been superceded by Session Limiting.
+#
+#     BEWARE!  The clone checking code is easily fooled; it can be
+#     triggered falsely under many conditions, for example:
+#
+#         - Multiple users connecting from a shell machine.
+#
+#         - A single user repeatedly connecting and disconnecting.
+#
+#     Be very sure you know what you're doing before you even think about
+#     enabling this option, and remember that Services comes with no
+#     warranty.
+#
+#     If that wasn't enough discouragement:
+#
+#     ***** DO NOT ENABLE THIS OPTION! *****
+#
+#     NOTE:  This option is not available when STREAMLINED is defined in
+#     the Makefile.
+
+#KillClones
+
 Anope Version 1.7.13
 --------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
diff --git a/version.log b/version.log
index 99ef23da2..3496440eb 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1414"
+VERSION_BUILD="1415"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1415)
+# BUGS  : 905
+# NOTES : Applied patch by Viper to add missing config file changes in Changes.conf
+#
 # BUILD : 1.7.21 (1414)
 # BUGS  : 832 925
 # NOTES : Applied patch from Twitch to fix warnings in users.c. Also corrected a typo made in previous commit to add +f support to inspircd11.c, and corrected various mistakes in Changes and version.log