[svn] - 2.2 operline

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

diff --git a/src/s_conf.c b/src/s_conf.c
index 5cdccf381eae92c0778e0787cb2516d45ed9cdc3..19c1593bab7d1c4b56f113eaed31ea62e0c9b5e2 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 3251 2007-03-05 18:58:38Z nenolod $
+ *  $Id: s_conf.c 3390 2007-04-05 00:12:55Z jilles $
  */
 
 #include "stdinc.h"
@@ -239,7 +239,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                                "I-line is full for %s!%s%s@%s (%s).",
                                source_p->name, IsGotId(source_p) ? "" : "~",
                                source_p->username, source_p->host,
-                               source_p->sockhost);
+                               show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "255.255.255.255");
 
                ilog(L_FUSER, "Too many connections from %s!%s%s@%s.", 
                        source_p->name, IsGotId(source_p) ? "" : "~",
@@ -337,8 +337,7 @@ verify_access(struct Client *client_p, const char *username)
        {
                if(aconf->flags & CONF_FLAGS_REDIR)
                {
-                       sendto_one(client_p, form_str(RPL_REDIR),
-                                       me.name, client_p->name,
+                       sendto_one_numeric(client_p, RPL_REDIR, form_str(RPL_REDIR),
                                        aconf->name ? aconf->name : "", aconf->port);
                        return (NOT_AUTHORISED);
                }
@@ -830,7 +829,6 @@ set_default_conf(void)
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
        ConfigChannel.burst_topicwho = NO;
-       ConfigChannel.invite_ops_only = YES;
        ConfigChannel.kick_on_split_riding = NO;
 
        ConfigChannel.default_split_user_count = 15000;
@@ -853,7 +851,7 @@ set_default_conf(void)
        ConfigFileEntry.reject_ban_time = 300;  
        ConfigFileEntry.reject_duration = 120;
 
-       ServerInfo.max_clients = MAXCONNECTIONS;
+       ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
 }
 
 #undef YES