commit 25dd193e9b49b38db39cf549f94df4ba11812fe9
from: Alexander Barton <alex@barton.de>
date: Wed Mar 16 22:43:29 2011 UTC

Move "ClientHost" and "ClientUserNick" to end of [Global] section

commit - 71d8c371711f70e2d4b7ef9c908443a018cd6701
commit + 25dd193e9b49b38db39cf549f94df4ba11812fe9
blob - 7cfe08f7cc8000df1d3f5ec26c8e498833cd5c48
blob + 85917597c543e7d0fdc368ccd733cbd8b448cbe6
--- doc/sample-ngircd.conf.tmpl
+++ doc/sample-ngircd.conf.tmpl
@@ -23,12 +23,6 @@
 	# Server name in the IRC network, must contain at least one dot
 	# (".") and be unique in the IRC network. Required!
 	Name = irc.the.net
-
-	# Set this hostname for every client instead of the real one
-	;ClientHost = irc.the.net
-
-	# Set every clients' user name to their nick name
-	;ClientUserNick = yes
 
 	# Info text of the server. This will be shown by WHOIS and
 	# LINKS requests for example.
@@ -160,6 +154,12 @@
 	# maximum nick name length!
 	;MaxNickLength = 9
 
+	# Set this hostname for every client instead of the real one
+	;ClientHost = irc.the.net
+
+	# Set every clients' user name to their nick name
+	;ClientUserNick = yes
+
 [Features]
 	# Do any DNS lookups when a client connects to the server.
 	;DNS = yes
blob - 487c1eb50bc1397bc8482abbc69275df676610f0
blob + 12893ad8f86446abaa1574280abefb14be6889a8
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -295,8 +295,6 @@ Conf_Test( void )
 
 	puts( "[GLOBAL]" );
 	printf("  Name = %s\n", Conf_ServerName);
-	printf("  ClientHost = %s\n", Conf_ClientHost);
-	printf("  ClientUserNick = %s\n", yesno_to_str(Conf_ClientUserNick));
 	printf("  Info = %s\n", Conf_ServerInfo);
 #ifndef PAM
 	printf("  Password = %s\n", Conf_ServerPwd);
@@ -353,7 +351,9 @@ Conf_Test( void )
 	printf("  MaxConnections = %ld\n", Conf_MaxConnections);
 	printf("  MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
 	printf("  MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
-	printf("  MaxNickLength = %u\n\n", Conf_MaxNickLength - 1);
+	printf("  MaxNickLength = %u\n", Conf_MaxNickLength - 1);
+	printf("  ClientHost = %s\n", Conf_ClientHost);
+	printf("  ClientUserNick = %s\n\n", yesno_to_str(Conf_ClientUserNick));
 
 	puts("[FEATURES]");
 	printf("  DNS = %s\n", yesno_to_str(Conf_DNS));