Backed out changeset 3097ade953f5

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

diff --git a/src/newconf.c b/src/newconf.c
index 33bf340cb8fce8e6ee5f72155ef6a36d062e81f3..a48f6397231dd999c592d30cc110b28b4bcc3fae 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1,5 +1,4 @@
 /* This code is in the public domain.
- * $Id: newconf.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -353,7 +352,6 @@ static struct mode_table cluster_table[] = {
        { "xline",      SHARED_PXLINE   },
        { "txline",     SHARED_TXLINE   },
        { "unxline",    SHARED_UNXLINE  },
-       { "die",        SHARED_DIE              },
        { "resv",       SHARED_PRESV    },
        { "tresv",      SHARED_TRESV    },
        { "unresv",     SHARED_UNRESV   },
@@ -378,6 +376,8 @@ static struct mode_table shared_table[] =
        { "unresv",     SHARED_UNRESV   },
        { "locops",     SHARED_LOCOPS   },
        { "rehash",     SHARED_REHASH   },
+       { "die",        SHARED_DIE              },
+       { "modules", SHARED_MODULE  },
        { "all",        SHARED_ALL      },
        { "none",       0               },
        {NULL, 0}
@@ -951,8 +951,8 @@ conf_end_auth(struct TopConf *tc)
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
 
-       if(EmptyString(yy_aconf->name))
-               yy_aconf->name = rb_strdup("NOMATCH");
+       if(EmptyString(yy_aconf->info.name))
+               yy_aconf->info.name = rb_strdup("NOMATCH");
 
        /* didnt even get one ->host? */
        if(EmptyString(yy_aconf->host))
@@ -986,7 +986,7 @@ conf_end_auth(struct TopConf *tc)
                        yy_tmp->spasswd = rb_strdup(yy_aconf->spasswd);
                
                /* this will always exist.. */
-               yy_tmp->name = rb_strdup(yy_aconf->name);
+               yy_tmp->info.name = rb_strdup(yy_aconf->info.name);
 
                if(yy_aconf->className)
                        yy_tmp->className = rb_strdup(yy_aconf->className);
@@ -1076,7 +1076,7 @@ static void
 conf_set_auth_autojoin_opers(void *data)
 {
        if(yy_aconf->autojoin_opers)
-               memset(yy_aconf->autojoin_opers, 0, strlen(yy_aconf->autojoin));
+               memset(yy_aconf->autojoin_opers, 0, strlen(yy_aconf->autojoin_opers));
        rb_free(yy_aconf->autojoin_opers);
        yy_aconf->autojoin_opers = rb_strdup(data);
 }
@@ -1137,8 +1137,8 @@ conf_set_auth_spoof(void *data)
                return;
        }
 
-       rb_free(yy_aconf->name);
-       yy_aconf->name = rb_strdup(data);
+       rb_free(yy_aconf->info.name);
+       yy_aconf->info.name = rb_strdup(data);
        yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
 }
 
@@ -1154,8 +1154,8 @@ static void
 conf_set_auth_redir_serv(void *data)
 {
        yy_aconf->flags |= CONF_FLAGS_REDIR;
-       rb_free(yy_aconf->name);
-       yy_aconf->name = rb_strdup(data);
+       rb_free(yy_aconf->info.name);
+       yy_aconf->info.name = rb_strdup(data);
 }
 
 static void
@@ -2062,6 +2062,8 @@ static struct ConfEntry conf_serverinfo_table[] =
 {
        { "description",        CF_QSTRING, NULL, 0, &ServerInfo.description    },
        { "network_desc",       CF_QSTRING, NULL, 0, &ServerInfo.network_desc   },
+       { "helpchan",           CF_QSTRING, NULL, 0, &ServerInfo.helpchan               },
+       { "helpurl",            CF_QSTRING, NULL, 0, &ServerInfo.helpurl                },
        { "hub",                CF_YESNO,   NULL, 0, &ServerInfo.hub            },
 
        { "network_name",       CF_QSTRING, conf_set_serverinfo_network_name,   0, NULL },
@@ -2211,6 +2213,7 @@ static struct ConfEntry conf_general_table[] =
        { "collision_fnc",      CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc       },
        { "connect_timeout",    CF_TIME,  NULL, 0, &ConfigFileEntry.connect_timeout     },
        { "default_floodcount", CF_INT,   NULL, 0, &ConfigFileEntry.default_floodcount  },
+       { "default_ident_timeout",      CF_INT, NULL, 0, &ConfigFileEntry.default_ident_timeout         },
        { "disable_auth",       CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth        },
        { "dots_in_ident",      CF_INT,   NULL, 0, &ConfigFileEntry.dots_in_ident       },
        { "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice  },
@@ -2252,6 +2255,7 @@ static struct ConfEntry conf_general_table[] =
        { "ts_warn_delta",      CF_TIME,  NULL, 0, &ConfigFileEntry.ts_warn_delta       },
        { "use_whois_actually", CF_YESNO, NULL, 0, &ConfigFileEntry.use_whois_actually  },
        { "warn_no_nline",      CF_YESNO, NULL, 0, &ConfigFileEntry.warn_no_nline       },
+       { "use_propagated_bans",CF_YESNO, NULL, 0, &ConfigFileEntry.use_propagated_bans },
        { "expire_override_time",       CF_TIME, NULL, 0, &ConfigFileEntry.expire_override_time},
        { "\0",                 0,        NULL, 0, NULL }
 };
@@ -2282,7 +2286,6 @@ static struct ConfEntry conf_channel_table[] =
        { "use_forward",        CF_YESNO, NULL, 0, &ConfigChannel.use_forward           },
        { "use_local_channels", CF_YESNO, NULL, 0, &ConfigChannel.use_local_channels    },
        { "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart        },
-       { "kick_no_rejoin_time", CF_TIME,  NULL, 0, &ConfigChannel.kick_no_rejoin_time  },
        { "exempt_cmode_c",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_c        },
        { "exempt_cmode_C",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_C        },
        { "exempt_cmode_D",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_D        },