Automated merge with ssh://hg.atheme.org//hg/charybdis

[irc/rqf/shadowircd.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 19c1593bab7d1c4b56f113eaed31ea62e0c9b5e2..2db0c872b86647ca67a80adf578e0facb4a7914b 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.c 3390 2007-04-05 00:12:55Z jilles $
+ *  $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -737,7 +737,6 @@ set_default_conf(void)
        memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
        ServerInfo.specific_ipv6_vhost = 0;
 #endif
-       ServerInfo.use_ts6 = YES;
 
        /* Don't reset hub, as that will break lazylinks */
        /* ServerInfo.hub = NO; */
@@ -850,6 +849,7 @@ set_default_conf(void)
         ConfigFileEntry.reject_after_count = 5;
        ConfigFileEntry.reject_ban_time = 300;  
        ConfigFileEntry.reject_duration = 120;
+       ConfigFileEntry.max_unknown_ip = 2;
 
        ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
 }