Enlarged buffer for version string ;-)

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 473ecfc6775d7b614cfc23789d97d91cf39b3c9a..1166c7b74881ade1349e508fc1cb578b04c534d8 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
 /*
  * ngIRCd -- The Next Generation IRC Daemon

- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2003 by 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
  *
  * 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


@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
 
 #include "portab.h"
 

-static char UNUSED id[] = "$Id: ngircd.c,v 1.69 2002/12/26 17:04:54 alex Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.74 2003/03/07 14:50:13 alex Exp $";

 
 #include "imp.h"
 #include <assert.h>
 
 #include "imp.h"
 #include <assert.h>


@@ -43,6 +43,10 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.69 2002/12/26 17:04:54 alex Exp $";
 #include "parse.h"
 #include "irc.h"
 
 #include "parse.h"
 #include "irc.h"
 

+#ifdef RENDEZVOUS
+#include "rendezvous.h"
+#endif
+

 #include "exp.h"
 #include "ngircd.h"
 
 #include "exp.h"
 #include "ngircd.h"
 


@@ -258,6 +262,9 @@ main( int argc, const char *argv[] )
                Lists_Init( );
                Channel_Init( );
                Client_Init( );
                Lists_Init( );
                Channel_Init( );
                Client_Init( );

+#ifdef RENDEZVOUS
+               Rendezvous_Init( );
+#endif

                Conn_Init( );
 
                /* Wenn als root ausgefuehrt und eine andere UID
                Conn_Init( );
 
                /* Wenn als root ausgefuehrt und eine andere UID


@@ -320,6 +327,9 @@ main( int argc, const char *argv[] )
 
                /* Alles abmelden */
                Conn_Exit( );
 
                /* Alles abmelden */
                Conn_Exit( );

+#ifdef RENDEZVOUS
+               Rendezvous_Exit( );
+#endif

                Client_Exit( );
                Channel_Exit( );
                Lists_Exit( );
                Client_Exit( );
                Channel_Exit( );
                Lists_Exit( );


@@ -347,7 +357,7 @@ NGIRCd_Version( VOID )
 GLOBAL CHAR *
 NGIRCd_VersionAddition( VOID )
 {
 GLOBAL CHAR *
 NGIRCd_VersionAddition( VOID )
 {

-       STATIC CHAR txt[64];
+       STATIC CHAR txt[200];

 
        strcpy( txt, "" );
 
 
        strcpy( txt, "" );
 


@@ -359,6 +369,14 @@ NGIRCd_VersionAddition( VOID )
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "ZLIB" );
 #endif
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "ZLIB" );
 #endif

+#ifdef USE_TCPWRAP
+       if( txt[0] ) strcat( txt, "+" );
+       strcat( txt, "TCPWRAP" );
+#endif
+#ifdef RENDEZVOUS
+       if( txt[0] ) strcat( txt, "+" );
+       strcat( txt, "RENDEZVOUS" );
+#endif

 #ifdef DEBUG
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "DEBUG" );
 #ifdef DEBUG
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "DEBUG" );


@@ -403,7 +421,7 @@ NGIRCd_Rehash( VOID )
        strcpy( old_name, Conf_ServerName );
 
        /* Konfiguration neu lesen ... */
        strcpy( old_name, Conf_ServerName );
 
        /* Konfiguration neu lesen ... */

-       Conf_Init( );
+       Conf_Rehash( );

 
        /* Alten Server-Namen wiederherstellen: dieser
         * kann nicht zur Laufzeit geaendert werden ... */
 
        /* Alten Server-Namen wiederherstellen: dieser
         * kann nicht zur Laufzeit geaendert werden ... */


@@ -506,7 +524,7 @@ LOCAL VOID
 Show_Version( VOID )
 {
        puts( NGIRCd_Version( ));
 Show_Version( VOID )
 {
        puts( NGIRCd_Version( ));

-       puts( "Copyright (c)2001,2002 by Alexander Barton (<alex@barton.de>)." );
+       puts( "Copyright (c)2001-2003 by Alexander Barton (<alex@barton.de>)." );

        puts( "Homepage: <http://arthur.ath.cx/~alex/ngircd/>\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." );
        puts( "Homepage: <http://arthur.ath.cx/~alex/ngircd/>\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." );