Deduce a server name when not set in the configuration

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 4fd7d44d255046470bec670cf22078c9b838280c..ec3238373084c79140357e7cd5a646e408c362c3 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2019 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2024 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@
 #include <grp.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <netdb.h>
 
 #include "ngircd.h"
 #include "conn.h"
@@ -408,7 +409,7 @@ Conf_Test( void )
 #endif
        printf("  DefaultUserModes = %s\n", Conf_DefaultUserModes);
        printf("  DNS = %s\n", yesno_to_str(Conf_DNS));
-#ifdef IDENT
+#ifdef IDENTAUTH
        printf("  Ident = %s\n", yesno_to_str(Conf_Ident));
 #endif
        printf("  IncludeDir = %s\n", Conf_IncludeDir);
@@ -1292,7 +1293,7 @@ WarnPAM(const char UNUSED *File, int UNUSED Line)
 /**
  * Handle variable in [Global] configuration section.
  *
- * @param Line Line numer in configuration file.
+ * @param Line Line number in configuration file.
  * @param Var  Variable name.
  * @param Arg  Variable argument.
  */
@@ -1447,7 +1448,7 @@ Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg )
 /**
  * Handle variable in [Limits] configuration section.
  *
- * @param Line Line numer in configuration file.
+ * @param Line Line number in configuration file.
  * @param Var  Variable name.
  * @param Arg  Variable argument.
  */
@@ -1536,7 +1537,7 @@ Handle_LIMITS(const char *File, int Line, char *Var, char *Arg)
 /**
  * Handle variable in [Options] configuration section.
  *
- * @param Line Line numer in configuration file.
+ * @param Line Line number in configuration file.
  * @param Var  Variable name.
  * @param Arg  Variable argument.
  */
@@ -1728,7 +1729,7 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg)
 /**
  * Handle variable in [SSL] configuration section.
  *
- * @param Line Line numer in configuration file.
+ * @param Line Line number in configuration file.
  * @param Var  Variable name.
  * @param Arg  Variable argument.
  */
@@ -1781,7 +1782,7 @@ Handle_SSL(const char *File, int Line, char *Var, char *Arg)
 /**
  * Handle variable in [Operator] configuration section.
  *
- * @param Line Line numer in configuration file.
+ * @param Line Line number in configuration file.
  * @param Var  Variable name.
  * @param Arg  Variable argument.
  */
@@ -1828,7 +1829,7 @@ Handle_OPERATOR(const char *File, int Line, char *Var, char *Arg )
 /**
  * Handle variable in [Server] configuration section.
  *
- * @param Line Line numer in configuration file.
+ * @param Line Line number in configuration file.
  * @param Var  Variable name.
  * @param Arg  Variable argument.
  */
@@ -1958,7 +1959,7 @@ Handle_Channelname(struct Conf_Channel *new_chan, const char *name)
 /**
  * Handle variable in [Channel] configuration section.
  *
- * @param Line Line numer in configuration file.
+ * @param Line Line number in configuration file.
  * @param Var  Variable name.
  * @param Arg  Variable argument.
  */
@@ -2053,6 +2054,7 @@ Validate_Config(bool Configtest, bool Rehash)
        /* Validate configuration settings. */
 
        int i, servers, servers_once;
+       struct hostent *h;
        bool config_valid = true;
        char *ptr;
 
@@ -2063,6 +2065,28 @@ Validate_Config(bool Configtest, bool Rehash)
                        NGIRCd_ConfFile);
        }
 
+       if (!Conf_ServerName[0]) {
+               /* No server name configured, try to get a sane name from the
+                * host name. Note: the IRC server name MUST contain
+                * at least one dot, so the "node name" is not sufficient! */
+               gethostname(Conf_ServerName, sizeof(Conf_ServerName));
+               if (Conf_DNS) {
+                       /* Try to get a proper host name ... */
+                       h = gethostbyname(Conf_ServerName);
+                       if (h)
+                               strlcpy(Conf_ServerName, h->h_name,
+                                       sizeof(Conf_ServerName));
+               }
+               if (!strchr(Conf_ServerName, '.')) {
+                       /* (Still) No dot in the name! */
+                       strlcat(Conf_ServerName, ".host",
+                               sizeof(Conf_ServerName));
+               }
+               Config_Error(LOG_WARNING,
+                            "No server name configured, using host name \"%s\".",
+                            Conf_ServerName);
+       }
+
        /* Validate configured server name, see RFC 2812 section 2.3.1 */
        ptr = Conf_ServerName;
        do {
@@ -2077,9 +2101,7 @@ Validate_Config(bool Configtest, bool Rehash)
                break;
        } while (*(++ptr));
 
-       if (!Conf_ServerName[0] || !strchr(Conf_ServerName, '.'))
-       {
-               /* No server name configured! */
+       if (!Conf_ServerName[0] || !strchr(Conf_ServerName, '.')) {
                config_valid = false;
                Config_Error(LOG_ALERT,
                             "No (valid) server name configured in \"%s\" (section 'Global': 'Name')!",