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

[ngircd-alex.git] / src / ngircd / conf.c

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index fa22df051c3addaa9ab029bd44dbad3197c65b89..12893ad8f86446abaa1574280abefb14be6889a8 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -7,13 +7,15 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Configuration management (reading, parsing & validation)
  */
 
-
 #include "portab.h"
 
+/**
+ * @file
+ * Configuration management (reading, parsing & validation)
+ */
+
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -349,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));
@@ -588,6 +592,8 @@ Set_Defaults(bool InitServers)
        int i;
 
        strcpy(Conf_ServerName, "");
+       strcpy(Conf_ClientHost, "");
+       Conf_ClientUserNick = false;
        snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s",
                 PACKAGE_NAME, PACKAGE_VERSION);
        strcpy(Conf_ServerPwd, "");
@@ -668,7 +674,7 @@ Read_Motd(const char *filename)
 
        fp = fopen(filename, "r");
        if (!fp) {
-               Log(LOG_WARNING, "Can't read MOTD file \"%s\": %s",
+               Config_Error(LOG_WARNING, "Can't read MOTD file \"%s\": %s",
                                        filename, strerror(errno));
                return;
        }
@@ -968,6 +974,18 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                        Config_Error_TooLong( Line, Var );
                return;
        }
+       if( strcasecmp( Var, "ClientHost" ) == 0 ) {
+               /* Client hostname */
+               len = strlcpy( Conf_ClientHost, Arg, sizeof( Conf_ClientHost ));
+               if (len >= sizeof( Conf_ClientHost ))
+                       Config_Error_TooLong( Line, Var );
+               return;
+       }
+       if( strcasecmp( Var, "ClientUserNick" ) == 0 ) {
+               /* Use client nick name as user name */
+               Conf_ClientUserNick = Check_ArgIsTrue( Arg );
+               return;
+       }
        if( strcasecmp( Var, "Info" ) == 0 ) {
                /* Info text of server */
                len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo ));
@@ -1055,11 +1073,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                pwd = getpwnam( Arg );
                if( pwd ) Conf_UID = pwd->pw_uid;
                else {
-#ifdef HAVE_ISDIGIT
-                       if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
-                       else
-#endif
                        Conf_UID = (unsigned int)atoi( Arg );
+                       if (!Conf_UID && strcmp(Arg, "0"))
+                               Config_Error_NaN(Line, Var);
                }
                return;
        }
@@ -1068,11 +1084,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                grp = getgrnam( Arg );
                if( grp ) Conf_GID = grp->gr_gid;
                else {
-#ifdef HAVE_ISDIGIT
-                       if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
-                       else
-#endif
-                       Conf_GID = (unsigned int)atoi( Arg );
+                       Conf_GID = (unsigned int)atoi(Arg);
+                       if (!Conf_GID && strcmp(Arg, "0"))
+                               Config_Error_NaN( Line, Var );
                }
                return;
        }
@@ -1153,29 +1167,23 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
        }
        if( strcasecmp( Var, "MaxConnections" ) == 0 ) {
                /* Maximum number of connections. 0 -> "no limit". */
-#ifdef HAVE_ISDIGIT
-               if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var);
-               else
-#endif
                Conf_MaxConnections = atol( Arg );
+               if (!Conf_MaxConnections && strcmp(Arg, "0"))
+                       Config_Error_NaN(Line, Var);
                return;
        }
        if( strcasecmp( Var, "MaxConnectionsIP" ) == 0 ) {
                /* Maximum number of simultaneous connections from one IP. 0 -> "no limit" */
-#ifdef HAVE_ISDIGIT
-               if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
-               else
-#endif
                Conf_MaxConnectionsIP = atoi( Arg );
+               if (!Conf_MaxConnectionsIP && strcmp(Arg, "0"))
+                       Config_Error_NaN(Line, Var);
                return;
        }
        if( strcasecmp( Var, "MaxJoins" ) == 0 ) {
                /* Maximum number of channels a user can join. 0 -> "no limit". */
-#ifdef HAVE_ISDIGIT
-               if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
-               else
-#endif
                Conf_MaxJoins = atoi( Arg );
+               if (!Conf_MaxJoins && strcmp(Arg, "0"))
+                       Config_Error_NaN(Line, Var);
                return;
        }
        if( strcasecmp( Var, "MaxNickLength" ) == 0 ) {
@@ -1371,11 +1379,12 @@ Handle_SERVER( int Line, char *Var, char *Arg )
        if( strcasecmp( Var, "Port" ) == 0 ) {
                /* Port to which this server should connect */
                port = atol( Arg );
-               if( port > 0 && port < 0xFFFF )
+               if (port >= 0 && port < 0xFFFF)
                        New_Server.port = (UINT16)port;
                else
-                       Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!",
-                                                                               NGIRCd_ConfFile, Line, port );
+                       Config_Error(LOG_ERR,
+                               "%s, line %d (section \"Server\"): Illegal port number %ld!",
+                               NGIRCd_ConfFile, Line, port );
                return;
        }
 #ifdef SSL_SUPPORT
@@ -1386,12 +1395,9 @@ Handle_SERVER( int Line, char *Var, char *Arg )
 #endif
        if( strcasecmp( Var, "Group" ) == 0 ) {
                /* Server group */
-#ifdef HAVE_ISDIGIT
-               if( ! isdigit( (int)*Arg ))
-                       Config_Error_NaN( Line, Var );
-               else
-#endif
                New_Server.group = atoi( Arg );
+               if (!New_Server.group && strcmp(Arg, "0"))
+                       Config_Error_NaN(Line, Var);
                return;
        }
        if( strcasecmp( Var, "Passive" ) == 0 ) {
@@ -1479,7 +1485,7 @@ Handle_CHANNEL(int Line, char *Var, char *Arg)
        if( strcasecmp( Var, "MaxUsers" ) == 0 ) {
                /* maximum user limit, mode l */
                chan->maxusers = (unsigned long) atol(Arg);
-               if (chan->maxusers == 0)
+               if (!chan->maxusers && strcmp(Arg, "0"))
                        Config_Error_NaN(Line, Var);
                return;
        }