Merge autogen.sh changes

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 554fee4a92d12e973c8b1f94864c8360e1dff6cf..ca5611098388b5551ccf73fa99c9c15c32c0ed3a 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -14,8 +14,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.105 2008/03/18 20:12:47 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -56,21 +54,9 @@ static CONF_SERVER New_Server;
 static int New_Server_Idx;
 
 
-#ifdef WANT_IPV6
-/*
- * these options appeared in ngircd 0.12; they are here
- * for backwards compatibility. They should be removed
- * in the future. Instead of setting these options,
- * the "Listen" option should be set accordingly.
- */
-static bool Conf_ListenIPv6;
-static bool Conf_ListenIPv4;
-#endif
-
-
 static void Set_Defaults PARAMS(( bool InitServers ));
 static bool Read_Config PARAMS(( bool ngircd_starting ));
-static void Validate_Config PARAMS(( bool TestOnly, bool Rehash ));
+static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash ));
 
 static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
 static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
@@ -84,6 +70,11 @@ static void Config_Error_TooLong PARAMS(( const int LINE, const char *Value ));
 
 static void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
 
+#ifdef WANT_IPV6
+#define DEFAULT_LISTEN_ADDRSTR "::,0.0.0.0"
+#else
+#define DEFAULT_LISTEN_ADDRSTR "0.0.0.0"
+#endif
 
 static char *
 strdup_warn(const char *str)
@@ -182,11 +173,14 @@ Conf_Test( void )
        struct group *grp;
        unsigned int i;
        char *topic;
+       bool config_valid;
 
        Use_Log = false;
 
-       Read_Config( true );
-       Validate_Config(true, false);
+       if (! Read_Config(true))
+               return 1;
+
+       config_valid = Validate_Config(true, false);
 
        /* If stdin and stdout ("you can read our nice message and we can
         * read in your keypress") are valid tty's, wait for a key: */
@@ -227,11 +221,6 @@ Conf_Test( void )
        printf( "  NoDNS = %s\n", yesno_to_str(Conf_NoDNS));
 
 #ifdef WANT_IPV6
-       /* both are deprecated, only mention them if their default value changed. */
-       if (!Conf_ListenIPv6)
-               puts("  ListenIPv6 = no");
-       if (!Conf_ListenIPv4)
-               puts("  ListenIPv4 = no");
        printf("  ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6));
        printf("  ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4));
 #endif
@@ -279,7 +268,7 @@ Conf_Test( void )
                printf( "  Topic = %s\n\n", topic ? topic : "");
        }
 
-       return 0;
+       return (config_valid ? 0 : 1);
 } /* Conf_Test */
 
 
@@ -480,9 +469,7 @@ Set_Defaults( bool InitServers )
        Conf_OperServerMode = false;
 
        Conf_ConnectIPv4 = true;
-       Conf_ListenIPv4 = true;
        Conf_ConnectIPv6 = true;
-       Conf_ListenIPv6 = true;
 
        Conf_MaxConnections = 0;
        Conf_MaxConnectionsIP = 5;
@@ -665,18 +652,9 @@ Read_Config( bool ngircd_starting )
                }
        }
 
-       if (!Conf_ListenAddress) {
-               /* no Listen addresses configured, use default */
-#ifdef WANT_IPV6
-               /* Conf_ListenIPv6/4 should no longer be used */
-               if (Conf_ListenIPv6 && Conf_ListenIPv4)
-                       Conf_ListenAddress = strdup_warn("::,0.0.0.0");
-               else if (Conf_ListenIPv6)
-                       Conf_ListenAddress = strdup_warn("::");
-               else
-#endif
-               Conf_ListenAddress = strdup_warn("0.0.0.0");
-       }
+       if (!Conf_ListenAddress)
+               Conf_ListenAddress = strdup_warn(DEFAULT_LISTEN_ADDRSTR);
+
        if (!Conf_ListenAddress) {
                Config_Error(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME);
                exit(1);
@@ -871,27 +849,6 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
        }
 #ifdef WANT_IPV6
        /* the default setting for all the WANT_IPV6 special options is 'true' */
-       if (strcasecmp(Var, "ListenIPv6") == 0) { /* DEPRECATED, option appeared in 0.12.0 */
-               /*
-                * listen on ipv6 sockets, if available?
-                * Deprecated use "Listen = 0.0.0.0" (or, rather, do not list "::")
-                */
-               Conf_ListenIPv6 = Check_ArgIsTrue( Arg );
-               Config_Error(LOG_WARNING, "%s, line %d: %s=%s is deprecated, %sinclude '::' in \"Listen =\" option instead",
-                               NGIRCd_ConfFile, Line, Var, yesno_to_str(Conf_ListenIPv6), Conf_ListenIPv6 ? " ":"do not ");
-               return;
-       }
-       if (strcasecmp(Var, "ListenIPv4") == 0) { /* DEPRECATED, option appeared in 0.12.0 */
-               /*
-                * listen on ipv4 sockets, if available?
-                * this allows "ipv6-only" setups
-                * Deprecated use "Listen = ::" (or, rather, do not list "0.0.0.0")
-                */
-               Conf_ListenIPv4 = Check_ArgIsTrue( Arg );
-               Config_Error(LOG_WARNING, "%s, line %d: %s=%s is deprecated, %sinclude '0.0.0.0' in \"Listen =\" option instead",
-                               NGIRCd_ConfFile, Line, Var, yesno_to_str(Conf_ListenIPv4), Conf_ListenIPv4 ? " ":"do not ");
-               return;
-       }
        if( strcasecmp( Var, "ConnectIPv6" ) == 0 ) {
                /* connect to other hosts using ipv6, if they have an AAAA record? */
                Conf_ConnectIPv6 = Check_ArgIsTrue( Arg );
@@ -1163,7 +1120,7 @@ Handle_CHANNEL( int Line, char *Var, char *Arg )
 } /* Handle_CHANNEL */
 
 
-static void
+static bool
 Validate_Config(bool Configtest, bool Rehash)
 {
        /* Validate configuration settings. */
@@ -1171,6 +1128,7 @@ Validate_Config(bool Configtest, bool Rehash)
 #ifdef DEBUG
        int i, servers, servers_once;
 #endif
+       bool config_valid = true;
        char *ptr;
 
        /* Validate configured server name, see RFC 2812 section 2.3.1 */
@@ -1189,6 +1147,7 @@ Validate_Config(bool Configtest, bool Rehash)
 
        if (!Conf_ServerName[0]) {
                /* No server name configured! */
+               config_valid = false;
                Config_Error(LOG_ALERT,
                             "No (valid) server name configured in \"%s\" (section 'Global': 'Name')!",
                             NGIRCd_ConfFile);
@@ -1202,6 +1161,7 @@ Validate_Config(bool Configtest, bool Rehash)
 
        if (Conf_ServerName[0] && !strchr(Conf_ServerName, '.')) {
                /* No dot in server name! */
+               config_valid = false;
                Config_Error(LOG_ALERT,
                             "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!",
                             NGIRCd_ConfFile);
@@ -1216,6 +1176,7 @@ Validate_Config(bool Configtest, bool Rehash)
 #ifdef STRICT_RFC
        if (!Conf_ServerAdminMail[0]) {
                /* No administrative contact configured! */
+               config_valid = false;
                Config_Error(LOG_ALERT,
                             "No administrator email address configured in \"%s\" ('AdminEMail')!",
                             NGIRCd_ConfFile);
@@ -1248,6 +1209,8 @@ Validate_Config(bool Configtest, bool Rehash)
            "Configuration: Operators=%d, Servers=%d[%d], Channels=%d",
            Conf_Oper_Count, servers, servers_once, Conf_Channel_Count);
 #endif
+
+       return config_valid;
 } /* Validate_Config */