Make this work again.

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

diff --git a/src/s_conf.c b/src/s_conf.c
index 19f9f3e025eefb4929f549820bb1e04ac6dbf874..47d8034651d9f3a38c4a3bffcd63ae6362cf4f4e 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -28,6 +28,7 @@
 #include "ircd_defs.h"
 #include "s_conf.h"
 #include "s_newconf.h"
+#include "newconf.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "channel.h"
@@ -46,11 +47,12 @@
 #include "reject.h"
 #include "cache.h"
 #include "blacklist.h"
+#include "privilege.h"
 #include "sslproc.h"
 
 struct config_server_hide ConfigServerHide;
 
-extern int yyparse();          /* defined in y.tab.c */
+extern int yyparse(void);              /* defined in y.tab.c */
 extern char linebuf[];
 
 #ifndef INADDR_NONE
@@ -308,7 +310,8 @@ verify_access(struct Client *client_p, const char *username)
                aconf = find_address_conf(client_p->host, client_p->sockhost, 
                                        client_p->username, client_p->username,
                                        (struct sockaddr *) &client_p->localClient->ip,
-                                       client_p->localClient->ip.ss_family);
+                                       client_p->localClient->ip.ss_family,
+                                       client_p->localClient->auth_user);
        }
        else
        {
@@ -317,7 +320,8 @@ verify_access(struct Client *client_p, const char *username)
                aconf = find_address_conf(client_p->host, client_p->sockhost,
                                        non_ident, client_p->username,
                                        (struct sockaddr *) &client_p->localClient->ip,
-                                       client_p->localClient->ip.ss_family);
+                                       client_p->localClient->ip.ss_family,
+                                       client_p->localClient->auth_user);
        }
 
        if(aconf == NULL)
@@ -395,32 +399,38 @@ static int
 add_ip_limit(struct Client *client_p, struct ConfItem *aconf)
 {
        rb_patricia_node_t *pnode;
+       int bitlen;
 
        /* If the limits are 0 don't do anything.. */
-       if(ConfCidrAmount(aconf) == 0 || ConfCidrBitlen(aconf) == 0)
+       if(ConfCidrAmount(aconf) == 0
+          || (ConfCidrIpv4Bitlen(aconf) == 0 && ConfCidrIpv6Bitlen(aconf) == 0))
                return -1;
 
        pnode = rb_match_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip);
 
+       if(GET_SS_FAMILY(&client_p->localClient->ip) == AF_INET)
+               bitlen = ConfCidrIpv4Bitlen(aconf);
+       else
+               bitlen = ConfCidrIpv6Bitlen(aconf);
+
        if(pnode == NULL)
-               pnode = make_and_lookup_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip, ConfCidrBitlen(aconf));
+               pnode = make_and_lookup_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip, bitlen);
 
        s_assert(pnode != NULL);
 
        if(pnode != NULL)
        {
-               if(((long) pnode->data) >= ConfCidrAmount(aconf)
-                  && !IsConfExemptLimits(aconf))
+               if(((intptr_t)pnode->data) >= ConfCidrAmount(aconf) && !IsConfExemptLimits(aconf))
                {
                        /* This should only happen if the limits are set to 0 */
-                       if((unsigned long) pnode->data == 0)
+                       if((intptr_t)pnode->data == 0)
                        {
                                rb_patricia_remove(ConfIpLimits(aconf), pnode);
                        }
                        return (0);
                }
 
-               pnode->data++;
+               pnode->data = (void *)(((intptr_t)pnode->data) + 1);
        }
        return 1;
 }
@@ -431,15 +441,16 @@ remove_ip_limit(struct Client *client_p, struct ConfItem *aconf)
        rb_patricia_node_t *pnode;
 
        /* If the limits are 0 don't do anything.. */
-       if(ConfCidrAmount(aconf) == 0 || ConfCidrBitlen(aconf) == 0)
+       if(ConfCidrAmount(aconf) == 0
+          || (ConfCidrIpv4Bitlen(aconf) == 0 && ConfCidrIpv6Bitlen(aconf) == 0))
                return;
 
        pnode = rb_match_ip(ConfIpLimits(aconf), (struct sockaddr *)&client_p->localClient->ip);
        if(pnode == NULL)
                return;
 
-       pnode->data--;
-       if(((unsigned long) pnode->data) == 0)
+       pnode->data = (void *)(((intptr_t)pnode->data) - 1);
+       if(((intptr_t)pnode->data) == 0)
        {
                rb_patricia_remove(ConfIpLimits(aconf), pnode);
        }
@@ -770,7 +781,6 @@ set_default_conf(void)
        ConfigFileEntry.hide_error_messages = 1;
        ConfigFileEntry.dots_in_ident = 0;
        ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
-       ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
        ConfigFileEntry.egdpool_path = NULL;
        ConfigFileEntry.use_whois_actually = YES;
        ConfigFileEntry.burst_away = NO;
@@ -796,6 +806,7 @@ set_default_conf(void)
        ConfigChannel.max_chans_per_user = 15;
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
+       ConfigChannel.only_ascii_channels = NO;
        ConfigChannel.burst_topicwho = NO;
        ConfigChannel.kick_on_split_riding = NO;
 
@@ -803,6 +814,7 @@ set_default_conf(void)
        ConfigChannel.default_split_server_count = 10;
        ConfigChannel.no_join_on_split = NO;
        ConfigChannel.no_create_on_split = YES;
+       ConfigChannel.resv_forcepart = YES;
 
        ConfigServerHide.flatten_links = 0;
        ConfigServerHide.links_delay = 300;
@@ -818,9 +830,13 @@ set_default_conf(void)
         ConfigFileEntry.reject_after_count = 5;
        ConfigFileEntry.reject_ban_time = 300;  
        ConfigFileEntry.reject_duration = 120;
-       ConfigFileEntry.max_unknown_ip = 2;
+       ConfigFileEntry.throttle_count = 4;
+       ConfigFileEntry.throttle_duration = 60;
 
        ServerInfo.default_max_clients = MAXCONNECTIONS;
+
+       if (!alias_dict)
+               alias_dict = irc_dictionary_create(strcasecmp);
 }
 
 #undef YES
@@ -844,6 +860,7 @@ read_conf(FILE * file)
        validate_conf();        /* Check to make sure some values are still okay. */
        /* Some global values are also loaded here. */
        check_class();          /* Make sure classes are valid */
+       privilegeset_delete_all_illegal();
 }
 
 static void
@@ -855,9 +872,6 @@ validate_conf(void)
        if(ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
                ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
 
-       if(ConfigFileEntry.servlink_path == NULL)
-               ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
-
        if(ServerInfo.network_name == NULL)
                ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
 
@@ -930,7 +944,7 @@ add_temp_kline(struct ConfItem *aconf)
        }
 
        aconf->flags |= CONF_FLAGS_TEMPORARY;
-       add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf);
+       add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
 }
 
 /* add_temp_dline()
@@ -964,7 +978,7 @@ add_temp_dline(struct ConfItem *aconf)
        }
 
        aconf->flags |= CONF_FLAGS_TEMPORARY;
-       add_conf_by_address(aconf->host, CONF_DLINE, aconf->user, aconf);
+       add_conf_by_address(aconf->host, CONF_DLINE, aconf->user, NULL, aconf);
 }
 
 /* expire_tkline()
@@ -1232,8 +1246,8 @@ clear_out_old_conf(void)
         */
 
        /* clean out general */
-       rb_free(ConfigFileEntry.servlink_path);
-       ConfigFileEntry.servlink_path = NULL;
+       rb_free(ConfigFileEntry.kline_reason);
+       ConfigFileEntry.kline_reason = NULL;
 
        RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
        {
@@ -1247,6 +1261,8 @@ clear_out_old_conf(void)
 
        destroy_blacklists();
 
+       privilegeset_mark_all_illegal();
+
        /* OK, that should be everything... */
 }
 
@@ -1430,8 +1446,8 @@ conf_add_class_to_conf(struct ConfItem *aconf)
        {
                if(aconf->status == CONF_CLIENT)
                {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                            "Warning -- Using default class for missing class \"%s\" in auth{} for %s@%s",
+                       conf_report_error(
+                                            "Using default class for missing class \"%s\" in auth{} for %s@%s",
                                             aconf->className, aconf->user, aconf->host);
                }
 
@@ -1474,7 +1490,7 @@ conf_add_d_conf(struct ConfItem *aconf)
        }
        else
        {
-               add_conf_by_address(aconf->host, CONF_DLINE, NULL, aconf);
+               add_conf_by_address(aconf->host, CONF_DLINE, NULL, NULL, aconf);
        }
 }
 
@@ -1511,10 +1527,10 @@ yyerror(const char *msg)
 
        strip_tabs(newlinebuf, linebuf, strlen(linebuf));
 
+       ierror("\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf);
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'",
                             conffilebuf, lineno + 1, msg, newlinebuf);
 
-       ilog(L_MAIN, "\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf);
 }
 
 int