From 944b0584ea02fd67ae77a36aef4f8600ba58d73d Mon Sep 17 00:00:00 2001
From: JD Horelick <jdhore1@gmail.com>
Date: Mon, 5 Apr 2010 16:29:11 -0400
Subject: [PATCH] Change config option for ident_timeout to
 default_ident_timeout as jilles recommended.

---
 doc/example.conf   | 2 +-
 doc/reference.conf | 2 +-
 include/s_conf.h   | 2 +-
 modules/m_info.c   | 4 ++--
 src/ircd.c         | 4 ++--
 src/newconf.c      | 2 +-
 src/s_conf.c       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/example.conf b/doc/example.conf
index ca0d9abf..8c9dbf23 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -475,7 +475,7 @@ general {
 	short_motd = no;
 	ping_cookie = no;
 	connect_timeout = 30 seconds;
-	ident_timeout = 5;
+	default_ident_timeout = 5;
 	disable_auth = no;
 	no_oper_flood = yes;
 	max_targets = 4;
diff --git a/doc/reference.conf b/doc/reference.conf
index 69afcacd..4c0e604b 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1119,7 +1119,7 @@ general {
 	/* ident timeout: Amount of time (in seconds) that the IRCd will
 	 * wait for a user to respond to an ident request.
 	 */
-	ident_timeout = 5;
+	default_ident_timeout = 5;
 
 	/* disable auth: disables identd checking */
 	disable_auth = no;
diff --git a/include/s_conf.h b/include/s_conf.h
index d1736a47..03e0d5fa 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -206,7 +206,7 @@ struct config_file_entry
 	int min_nonwildcard_simple;
 	int default_floodcount;
 	int client_flood;
-	int ident_timeout;
+	int default_ident_timeout;
 	int use_egd;
 	int ping_cookie;
 	int tkline_expire_notices;
diff --git a/modules/m_info.c b/modules/m_info.c
index 6569dc84..62d75f75 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -134,9 +134,9 @@ static struct InfoStruct info_table[] = {
 		"Connect timeout for connections to servers"
 	},
 	{
-		"ident_timeout",
+		"default_ident_timeout",
 		OUTPUT_DECIMAL,
-		&ConfigFileEntry.ident_timeout,
+		&ConfigFileEntry.default_ident_timeout,
 		"Amount of time the server waits for ident responses from clients",
 	},
 	{
diff --git a/src/ircd.c b/src/ircd.c
index add5f65b..b5f8076a 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -324,8 +324,8 @@ initialize_global_set_options(void)
 		splitchecking = 1;
 	}
 
-	if(ConfigFileEntry.ident_timeout)
-		GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout;
+	if(ConfigFileEntry.default_ident_timeout)
+		GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
 	else
 		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
 
diff --git a/src/newconf.c b/src/newconf.c
index b02beece..1769d35d 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2136,7 +2136,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	},
-	{ "ident_timeout",	CF_INT, NULL, 0, &ConfigFileEntry.ident_timeout		},
+	{ "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	},
diff --git a/src/s_conf.c b/src/s_conf.c
index 1bc1bda2..d8808c70 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -782,7 +782,7 @@ set_default_conf(void)
 	ConfigFileEntry.min_nonwildcard = 4;
 	ConfigFileEntry.min_nonwildcard_simple = 3;
 	ConfigFileEntry.default_floodcount = 8;
-	ConfigFileEntry.ident_timeout = 5;
+	ConfigFileEntry.default_ident_timeout = 5;
 	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
 	ConfigFileEntry.tkline_expire_notices = 0;