Update copyright notices for 2010 :)

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index de0b490dab81a5aa025a859ac3801c17ffb602c8..63fc64bf2ef2ac6a34ff847bb9f59ad7d1b036d8 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2011 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
@@ -69,6 +69,7 @@ static void Setup_FDStreams PARAMS(( int fd ));
 
 static bool NGIRCd_Init PARAMS(( bool ));
 
+
 /**
  * The main() function of ngIRCd.
  * Here all starts: this function is called by the operating system loader,
@@ -93,7 +94,7 @@ main( int argc, const char *argv[] )
 
        umask( 0077 );
 
-       NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = false;
+       NGIRCd_SignalQuit = NGIRCd_SignalRestart = false;
        NGIRCd_Passive = false;
 #ifdef DEBUG
        NGIRCd_Debug = false;
@@ -261,7 +262,6 @@ main( int argc, const char *argv[] )
                NGIRCd_Start = time( NULL );
                (void)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start ));
 
-               NGIRCd_SignalRehash = false;
                NGIRCd_SignalRestart = false;
                NGIRCd_SignalQuit = false;
 
@@ -285,11 +285,6 @@ main( int argc, const char *argv[] )
 #endif
                Conn_Init( );
 
-#ifdef DEBUG
-               /* Redirect stderr handle to "error file" for debugging
-                * when not running in "no daemon" mode: */
-               if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( );
-#endif
                if (!io_library_init(CONNECTION_POOL)) {
                        Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno));
                        exit(1);
@@ -430,56 +425,6 @@ Fill_Version( void )
        } /* Fill_Version */
 
 
-/**
- * Reload the server configuration file.
- */
-GLOBAL void
-NGIRCd_Rehash( void )
-{
-       char old_name[CLIENT_ID_LEN];
-       unsigned old_nicklen;
-
-       Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" );
-       NGIRCd_SignalRehash = false;
-
-       /* Remember old server name and nick name length */
-       strlcpy( old_name, Conf_ServerName, sizeof old_name );
-       old_nicklen = Conf_MaxNickLength;
-
-       /* Re-read configuration ... */
-       if (!Conf_Rehash( ))
-               return;
-
-       /* Close down all listening sockets */
-       Conn_ExitListeners( );
-
-       /* Recover old server name and nick name length: these values can't
-        * be changed during run-time */
-       if (strcmp(old_name, Conf_ServerName) != 0 ) {
-               strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName);
-               Log(LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name.");
-       }
-       if (old_nicklen != Conf_MaxNickLength) {
-               Conf_MaxNickLength = old_nicklen;
-               Log(LOG_ERR, "Can't change \"MaxNickLength\" on runtime! Ignored new value.");
-       }
-
-       /* Create new pre-defined channels */
-       Channel_InitPredefined( );
-
-       if (!ConnSSL_InitLibrary())
-               Log(LOG_WARNING, "Re-Initializing SSL failed, using old keys");
-
-       /* Start listening on sockets */
-       Conn_InitListeners( );
-
-       /* Sync configuration with established connections */
-       Conn_SyncServerStruct( );
-
-       Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." );
-} /* NGIRCd_Rehash */
-
-
 /**
  * Display copyright and version information of ngIRCd on the console.
  */
@@ -487,7 +432,7 @@ static void
 Show_Version( void )
 {
        puts( NGIRCd_Version );
-       puts( "Copyright (c)2001-2010 Alexander Barton (<alex@barton.de>) and Contributors." );
+       puts( "Copyright (c)2001-2011 Alexander Barton (<alex@barton.de>) and Contributors." );
        puts( "Homepage: <http://ngircd.barton.de/>\n" );
        puts( "This is free software; see the source for copying conditions. There is NO" );
        puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );
@@ -774,4 +719,5 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        return false;
 }
 
+
 /* -eof- */