dns: clean up awful hacks.

[solanum.git] / ircd / s_conf.c

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index ebd6919bb8fc6a82da5c1d69de3b3c5f71e34b06..6eaf80c0b41bd6b2cd0ee9b75f30439c5bf62e8b 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -647,7 +645,7 @@ rehash(int sig)
                                     "Got signal SIGHUP, reloading ircd conf. file");
        }
 
-       restart_authd();
+       rehash_authd();
        /* don't close listeners until we know we can go ahead with the rehash */
        read_conf_files(NO);
 
@@ -780,6 +778,7 @@ set_default_conf(void)
        ConfigChannel.knock_delay = 300;
        ConfigChannel.knock_delay_channel = 60;
        ConfigChannel.max_chans_per_user = 15;
+       ConfigChannel.max_chans_per_user_large = 60;
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
        ConfigChannel.only_ascii_channels = NO;
@@ -824,9 +823,10 @@ set_default_conf(void)
 
        ConfigFileEntry.nicklen = NICKLEN;
        ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA1;
+       ConfigFileEntry.hide_opers_in_whois = 0;
 
        if (!alias_dict)
-               alias_dict = irc_dictionary_create("alias", strcasecmp);
+               alias_dict = rb_dictionary_create("alias", strcasecmp);
 }
 
 #undef YES
@@ -1267,13 +1267,13 @@ get_oper_name(struct Client *client_p)
 
        if(MyOper(client_p))
        {
-               rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+               snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                                client_p->name, client_p->username,
                                client_p->host, client_p->localClient->opername);
                return buffer;
        }
 
-       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+       snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                   client_p->name, client_p->username,
                   client_p->host, client_p->servptr->name);
        return buffer;
@@ -1317,7 +1317,7 @@ get_user_ban_reason(struct ConfItem *aconf)
 
        if (aconf->flags & CONF_FLAGS_TEMPORARY &&
                        (aconf->status == CONF_KILL || aconf->status == CONF_DLINE))
-               rb_snprintf(reasonbuf, sizeof reasonbuf,
+               snprintf(reasonbuf, sizeof reasonbuf,
                                "Temporary %c-line %d min. - ",
                                aconf->status == CONF_DLINE ? 'D' : 'K',
                                (int)((aconf->hold - aconf->created) / 60));
@@ -1353,7 +1353,7 @@ get_printable_kline(struct Client *source_p, struct ConfItem *aconf,
                *oper_reason = NULL;
        else
        {
-               rb_snprintf(operreasonbuf, sizeof operreasonbuf, "%s%s(%s)",
+               snprintf(operreasonbuf, sizeof operreasonbuf, "%s%s(%s)",
                                EmptyString(aconf->spasswd) ? "" : aconf->spasswd,
                                EmptyString(aconf->spasswd) ? "" : " ",
                                aconf->info.oper);
@@ -1532,7 +1532,7 @@ clear_out_old_conf(void)
        /* remove any aliases... -- nenolod */
        if (alias_dict != NULL)
        {
-               irc_dictionary_destroy(alias_dict, free_alias_cb, NULL);
+               rb_dictionary_destroy(alias_dict, free_alias_cb, NULL);
                alias_dict = NULL;
        }