/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2008 Alexander Barton (alex@barton.de).
*
* 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
#include "portab.h"
-static char UNUSED id[] = "$Id: ngircd.c,v 1.118 2008/02/26 22:04:17 fw Exp $";
-
/**
* @file
* The main program, including the C function main() which is called
#include "client.h"
#include "channel.h"
#include "conf.h"
-#include "cvs-version.h"
#include "lists.h"
#include "log.h"
#include "parse.h"
strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition ));
strlcat( NGIRCd_VersionAddition, TARGET_OS, sizeof( NGIRCd_VersionAddition ));
-#ifdef CVSDATE
- snprintf( NGIRCd_Version, sizeof NGIRCd_Version,"%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition);
-#else
- snprintf( NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
-#endif
-} /* Fill_Version */
+ snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s",
+ PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
+ } /* Fill_Version */
/**
Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" );
NGIRCd_SignalRehash = false;
- /* Close down all listening sockets */
- Conn_ExitListeners( );
-
/* Remember old server name and nick name length */
strlcpy( old_name, Conf_ServerName, sizeof old_name );
old_nicklen = Conf_MaxNickLength;
/* Re-read configuration ... */
- Conf_Rehash( );
+ 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 */
Show_Version( void )
{
puts( NGIRCd_Version );
- puts( "Copyright (c)2001-2007 Alexander Barton (<alex@barton.de>) and Contributors." );
+ puts( "Copyright (c)2001-2008 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." );