Branch merge.

This commit is contained in:
Jilles Tjoelker 2007-12-24 18:24:49 +01:00
commit 965dfbd38a
7 changed files with 0 additions and 27 deletions

View File

@ -381,7 +381,6 @@ general {
default_floodcount = 10;
failed_oper_notice = yes;
dots_in_ident=2;
dot_in_ip6_addr = no;
min_nonwildcard = 4;
min_nonwildcard_simple = 3;
max_accept = 100;

View File

@ -833,12 +833,6 @@ general {
*/
dots_in_ident=2;
/* dot in ipv6: ircd-hybrid-6.0 and earlier will disallow hosts
* without a '.' in them. this will add one to the end. only needed
* for older servers.
*/
dot_in_ip6_addr = no;
/* min nonwildcard: the minimum non wildcard characters in k/d/g lines
* placed via the server. klines hand placed are exempt from limits.
* wildcard chars: '.' '*' '?' '@'

View File

@ -186,7 +186,6 @@ struct config_file_entry
unsigned char compression_level;
int disable_fake_channels;
int dot_in_ip6_addr;
int dots_in_ident;
int failed_oper_notice;
int anti_nick_flood;

View File

@ -170,12 +170,6 @@ static struct InfoStruct info_table[] = {
&ConfigFileEntry.disable_fake_channels,
"Controls whether bold etc are disabled for JOIN"
},
{
"dot_in_ip6_addr",
OUTPUT_BOOLEAN,
&ConfigFileEntry.dot_in_ip6_addr,
"Suffix a . to ip6 addresses",
},
{
"dots_in_ident",
OUTPUT_DECIMAL,

View File

@ -465,13 +465,6 @@ add_connection(listener_t *listener, int fd, struct sockaddr *sai, int exempt)
strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
#ifdef IPV6
if(new_client->localClient->ip.ss_family == AF_INET6 && ConfigFileEntry.dot_in_ip6_addr == 1)
{
strlcat(new_client->host, ".", sizeof(new_client->host));
}
#endif
new_client->localClient->fd = fd;
new_client->localClient->listener = listener;

View File

@ -2011,7 +2011,6 @@ static struct ConfEntry conf_general_table[] =
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount },
{ "disable_auth", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth },
{ "dot_in_ip6_addr", CF_YESNO, NULL, 0, &ConfigFileEntry.dot_in_ip6_addr },
{ "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident },
{ "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice },
{ "glines", CF_YESNO, NULL, 0, &ConfigFileEntry.glines },

View File

@ -304,11 +304,6 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
sendto_one_notice(source_p, ":*** Notice -- You have an illegal character in your hostname");
strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
#ifdef IPV6
if(ConfigFileEntry.dot_in_ip6_addr == 1)
strlcat(source_p->host, ".", sizeof(source_p->host));
#endif
}