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

diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl
index 7cfe08f7cc8000df1d3f5ec26c8e498833cd5c48..85917597c543e7d0fdc368ccd733cbd8b448cbe6 100644 (file)
--- a/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@ -24,12 +24,6 @@
        # (".") and be unique in the IRC network. Required!
        Name = irc.the.net
 
        # (".") 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.
        Info = Server Info Text
        # Info text of the server. This will be shown by WHOIS and
        # LINKS requests for example.
        Info = Server Info Text


@@ -160,6 +154,12 @@
        # maximum nick name length!
        ;MaxNickLength = 9
 
        # 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
 [Features]
        # Do any DNS lookups when a client connects to the server.
        ;DNS = yes

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 487c1eb50bc1397bc8482abbc69275df676610f0..12893ad8f86446abaa1574280abefb14be6889a8 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -295,8 +295,6 @@ Conf_Test( void )
 
        puts( "[GLOBAL]" );
        printf("  Name = %s\n", Conf_ServerName);
 
        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);
        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("  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));
 
        puts("[FEATURES]");
        printf("  DNS = %s\n", yesno_to_str(Conf_DNS));