Fix potential buffer-overflow from malformed RSFNC request.

[solanum.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index 2cb8824d465361be5a9d1af9d709a03097d8a5e2..95013c53601f7d7b7b054bd22eaef693d5423867 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2098,15 +2098,15 @@ static struct ConfEntry conf_admin_table[] =
 
 static struct ConfEntry conf_log_table[] =
 {
-       { "fname_userlog",      CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_userlog    },
-       { "fname_fuserlog",     CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_fuserlog   },
-       { "fname_operlog",      CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_operlog    },
-       { "fname_foperlog",     CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_foperlog   },
-       { "fname_serverlog",    CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_serverlog  },
-       { "fname_killlog",      CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_killlog    },
-       { "fname_klinelog",     CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_klinelog   },
-       { "fname_operspylog",   CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_operspylog },
-       { "fname_ioerrorlog",   CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.fname_ioerrorlog },
+       { "fname_userlog",      CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_userlog      },
+       { "fname_fuserlog",     CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_fuserlog     },
+       { "fname_operlog",      CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_operlog      },
+       { "fname_foperlog",     CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_foperlog     },
+       { "fname_serverlog",    CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_serverlog    },
+       { "fname_killlog",      CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_killlog      },
+       { "fname_klinelog",     CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_klinelog     },
+       { "fname_operspylog",   CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_operspylog   },
+       { "fname_ioerrorlog",   CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.fname_ioerrorlog },
        { "\0",                 0,          NULL, 0,          NULL }
 };
 
@@ -2192,7 +2192,7 @@ static struct ConfEntry conf_general_table[] =
        { "default_operstring", CF_QSTRING, NULL, REALLEN,    &ConfigFileEntry.default_operstring },
        { "default_adminstring",CF_QSTRING, NULL, REALLEN,    &ConfigFileEntry.default_adminstring },
        { "servicestring",      CF_QSTRING, NULL, REALLEN,    &ConfigFileEntry.servicestring },
-       { "egdpool_path",       CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.egdpool_path },
+       { "egdpool_path",       CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.egdpool_path },
        { "kline_reason",       CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.kline_reason },
        { "identify_service",   CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifyservice },
        { "identify_command",   CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifycommand },
@@ -2207,7 +2207,6 @@ static struct ConfEntry conf_general_table[] =
        { "burst_away",         CF_YESNO, NULL, 0, &ConfigFileEntry.burst_away          },
        { "caller_id_wait",     CF_TIME,  NULL, 0, &ConfigFileEntry.caller_id_wait      },
        { "client_exit",        CF_YESNO, NULL, 0, &ConfigFileEntry.client_exit         },
-       { "client_flood",       CF_INT,   NULL, 0, &ConfigFileEntry.client_flood        },
        { "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  },
@@ -2252,6 +2251,11 @@ static struct ConfEntry conf_general_table[] =
        { "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 },
+       { "client_flood_max_lines",     CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_max_lines      },
+       { "client_flood_burst_rate",    CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_burst_rate     },
+       { "client_flood_burst_max",     CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_burst_max      },
+       { "client_flood_message_num",   CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_message_num    },
+       { "client_flood_message_time",  CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_message_time   },
        { "\0",                 0,        NULL, 0, NULL }
 };
 
@@ -2271,8 +2275,8 @@ static struct ConfEntry conf_channel_table[] =
        { "only_ascii_channels", CF_YESNO, NULL, 0, &ConfigChannel.only_ascii_channels },
        { "use_except",         CF_YESNO, NULL, 0, &ConfigChannel.use_except            },
        { "use_invex",          CF_YESNO, NULL, 0, &ConfigChannel.use_invex             },
-       { "use_knock",          CF_YESNO, NULL, 0, &ConfigChannel.use_knock             },
        { "use_forward",        CF_YESNO, NULL, 0, &ConfigChannel.use_forward           },
+       { "use_knock",          CF_YESNO, NULL, 0, &ConfigChannel.use_knock             },
        { "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart        },
        { "channel_target_change", CF_YESNO, NULL, 0, &ConfigChannel.channel_target_change      },
        { "disable_local_channels", CF_YESNO, NULL, 0, &ConfigChannel.disable_local_channels },