New configuration option "PAMIsOptional"

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index e595caf03ceb0567f478b1939080e0a727d13d71..3e64f3594d29571d68c0dad0568f7fdeb02e17c9 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -38,6 +38,7 @@
 
 #include "defines.h"
 #include "conn.h"
+#include "class.h"
 #include "conf-ssl.h"
 #include "channel.h"
 #include "conf.h"
@@ -60,6 +61,8 @@ static void Pidfile_Delete PARAMS(( void ));
 
 static void Fill_Version PARAMS(( void ));
 
+static void Random_Init PARAMS(( void ));
+
 static void Setup_FDStreams PARAMS(( int fd ));
 
 static bool NGIRCd_Init PARAMS(( bool ));
@@ -67,11 +70,13 @@ static bool NGIRCd_Init PARAMS(( bool ));
 
 /**
  * The main() function of ngIRCd.
+ *
  * Here all starts: this function is called by the operating system loader,
  * it is the first portion of code executed of ngIRCd.
- * @param argc The number of arguments passed to ngIRCd on the command line.
- * @param argv An array containing all the arguments passed to ngIRCd.
- * @return Global exit code of ngIRCd, zero on success.
+ *
+ * @param argc The number of arguments passed to ngIRCd on the command line.
+ * @param argv An array containing all the arguments passed to ngIRCd.
+ * @return     Global exit code of ngIRCd, zero on success.
  */
 GLOBAL int
 main( int argc, const char *argv[] )
@@ -232,7 +237,7 @@ main( int argc, const char *argv[] )
                }
        }
 
-       /* Debug-Level (for IRCs "VERSION" command) */
+       /* Debug level for "VERSION" command */
        NGIRCd_DebugLevel[0] = '\0';
 #ifdef DEBUG
        if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" );
@@ -260,6 +265,8 @@ main( int argc, const char *argv[] )
                NGIRCd_SignalRestart = false;
                NGIRCd_SignalQuit = false;
 
+               Random_Init();
+
                /* Initialize modules, part I */
                Log_Init( ! NGIRCd_NoDaemon );
                Conf_Init( );
@@ -276,6 +283,7 @@ main( int argc, const char *argv[] )
                Channel_Init( );
                Client_Init( );
                Conn_Init( );
+               Class_Init( );
 
                if (!io_library_init(CONNECTION_POOL)) {
                        Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno));
@@ -287,11 +295,9 @@ main( int argc, const char *argv[] )
                        exit(1);
                }
 
-               /*
-                * create protocol and server identification.
-                * The syntax used by ngIRCd in PASS commands and the extended flags
-                * are described in doc/Protocol.txt
-                */
+               /* Create protocol and server identification. The syntax
+                * used by ngIRCd in PASS commands and the known "extended
+                * flags" are described in doc/Protocol.txt. */
 #ifdef IRCPLUS
                snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS );
 #ifdef ZLIB
@@ -316,14 +322,14 @@ main( int argc, const char *argv[] )
                        Pidfile_Delete( );
                        exit( 1 );
                }
-               
-               /* Hauptschleife */
+
+               /* Main Run Loop */
                Conn_Handler( );
 
-               /* Alles abmelden */
                Conn_Exit( );
                Client_Exit( );
                Channel_Exit( );
+               Class_Exit( );
                Log_Exit( );
        }
        Pidfile_Delete( );
@@ -333,10 +339,12 @@ main( int argc, const char *argv[] )
 
 
 /**
- * Generate ngIRCd "version string".
- * This string is generated once and then stored in NGIRCd_Version for
- * further usage, for example by the IRC command VERSION and the --version
- * command line switch.
+ * Generate ngIRCd "version strings".
+ *
+ * The ngIRCd version information is generated once and then stored in the
+ * NGIRCd_Version and NGIRCd_VersionAddition string variables for further
+ * usage, for example by the IRC command "VERSION" and the --version command
+ * line switch.
  */
 static void
 Fill_Version( void )
@@ -466,7 +474,8 @@ Pidfile_Delete( void )
 
 /**
  * Create the file containing the process ID of ngIRCd ("PID file").
- * @param pid The process ID to be stored in this file.
+ *
+ * @param pid  The process ID to be stored in this file.
  */
 static void
 Pidfile_Create(pid_t pid)
@@ -504,6 +513,8 @@ Pidfile_Create(pid_t pid)
 
 /**
  * Redirect stdin, stdout and stderr to apropriate file handles.
+ *
+ * @param fd   The file handle stdin, stdout and stderr should be redirected to.
  */
 static void
 Setup_FDStreams(int fd)
@@ -519,6 +530,13 @@ Setup_FDStreams(int fd)
 } /* Setup_FDStreams */
 
 
+/**
+ * Get user and group ID of unprivileged "nobody" user.
+ *
+ * @param uid  User ID
+ * @param gid  Group ID
+ * @return     true on success.
+ */
 static bool
 NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 {
@@ -543,7 +561,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
        if ( !pwd->pw_uid || !pwd->pw_gid)
                return false;
 
-       *uid = pwd->pw_uid;     
+       *uid = pwd->pw_uid;
        *gid = pwd->pw_gid;
        endpwent();
 
@@ -551,6 +569,44 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 } /* NGIRCd_getNobodyID */
 
 
+static bool
+Random_Init_Kern(const char *file)
+{
+       unsigned int seed;
+       bool ret = false;
+       int fd = open(file, O_RDONLY);
+       if (fd >= 0) {
+               if (read(fd, &seed, sizeof(seed)) == sizeof(seed))
+                       ret = true;
+               close(fd);
+               srand(seed);
+       }
+       return ret;
+}
+
+/**
+ * Initialize libc rand(3) number generator
+ */
+static void
+Random_Init(void)
+{
+       if (Random_Init_Kern("/dev/urandom"))
+               return;
+       if (Random_Init_Kern("/dev/random"))
+               return;
+       if (Random_Init_Kern("/dev/arandom"))
+               return;
+       srand(rand() ^ (unsigned)getpid() ^ (unsigned)time(NULL));
+}
+
+
+/**
+ * Initialize ngIRCd daemon.
+ *
+ * @param NGIRCd_NoDaemon      Set to true if ngIRCd should run in the
+ *                             foreground and not as a daemon.
+ * @return                     true on success.
+ */
 static bool
 NGIRCd_Init( bool NGIRCd_NoDaemon ) 
 {
@@ -653,10 +709,8 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
 
                /* Detach stdin, stdout and stderr */
                Setup_FDStreams(fd);
-               if (fd > 2) {
+               if (fd > 2)
                        close(fd);
-                       fd = -1;
-               }
        }
        pid = getpid();