[svn] Don't show the UID if a TS6 server sends a kick with

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

diff --git a/src/s_conf.c b/src/s_conf.c
index ea0dc8d772dad912be490097b86cf58e785345c7..bb59cbfc72bfecb11a22411efb345f1fc8819ccb 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 3161 2007-01-25 07:23:01Z nenolod $
+ *  $Id: s_conf.c 3271 2007-03-18 14:44:24Z jilles $
  */
 
 #include "stdinc.h"
@@ -188,10 +188,15 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                break;
 
        case TOO_MANY_LOCAL:
+               /* Note that these notices are sent to opers on other
+                * servers also, so even if local opers are allowed to
+                * see the IP, we still cannot send it.
+                */
                sendto_realops_snomask(SNO_FULL, L_NETWIDE,
                                "Too many local connections for %s!%s%s@%s",
                                source_p->name, IsGotId(source_p) ? "" : "~",
-                               source_p->username, source_p->sockhost);
+                               source_p->username,
+                               show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
 
                ilog(L_FUSER, "Too many local connections from %s!%s%s@%s",
                        source_p->name, IsGotId(source_p) ? "" : "~",
@@ -205,7 +210,8 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                sendto_realops_snomask(SNO_FULL, L_NETWIDE,
                                "Too many global connections for %s!%s%s@%s",
                                source_p->name, IsGotId(source_p) ? "" : "~",
-                               source_p->username, source_p->sockhost);
+                               source_p->username,
+                               show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
                ilog(L_FUSER, "Too many global connections from %s!%s%s@%s",
                        source_p->name, IsGotId(source_p) ? "" : "~",
                        source_p->username, source_p->sockhost);
@@ -218,7 +224,8 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                sendto_realops_snomask(SNO_FULL, L_NETWIDE,
                                "Too many user connections for %s!%s%s@%s",
                                source_p->name, IsGotId(source_p) ? "" : "~",
-                               source_p->username, source_p->sockhost);
+                               source_p->username,
+                               show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
                ilog(L_FUSER, "Too many user connections from %s!%s%s@%s",
                        source_p->name, IsGotId(source_p) ? "" : "~",
                        source_p->username, source_p->sockhost);
@@ -232,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) ? "" : "~",
@@ -823,7 +830,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;
@@ -845,7 +851,8 @@ set_default_conf(void)
         ConfigFileEntry.reject_after_count = 5;
        ConfigFileEntry.reject_ban_time = 300;  
        ConfigFileEntry.reject_duration = 120;
-                        
+
+       ServerInfo.max_clients = MAXCONNECTIONS;
 }
 
 #undef YES