New configuration option "OperServerMode".

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index eb32afdd134a9988fc17a0fe7282c4d4b82236ef..8d7f6d37cb6c78f076c7afb9bfb33b215a9177ac 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2004 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
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.122 2003/11/05 23:24:48 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.124 2004/02/28 02:18:16 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -210,6 +210,7 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *from, *target, *c;
        CONN_ID idx, idx2;
+       CHAR user[CLIENT_USER_LEN];
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -251,7 +252,9 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
                        if( Client_Type( c ) == CLIENT_SERVER )
                        {
                                /* Server link */
-                               if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Client_ID( c ), Client_Mask( c ), Option_String( Client_Conn( c )))) return DISCONNECTED;
+                               strlcpy( user, Client_User( c ), sizeof( user ));
+                               if( user[0] == '~' ) strlcpy( user, "unknown", sizeof( user ));
+                               if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Client_ID( c ), user, Client_Hostname( c ), Client_Mask( Client_ThisServer( )), Option_String( Client_Conn( c )))) return DISCONNECTED;
                        }
                        if(( Client_Type( c ) == CLIENT_USER ) && ( strchr( Client_Modes( c ), 'o' )))
                        {
@@ -262,9 +265,6 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
                c = Client_Next( c );
        }
 
-       /* Some information about us */
-       if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Conf_ServerName, Client_Mask( Client_ThisServer( )), Option_String( Client_Conn( Client )))) return DISCONNECTED;
-
        IRC_SetPenalty( Client, 3 );
        return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel );
 } /* IRC_TRACE */
@@ -302,7 +302,7 @@ Option_String( CONN_ID Idx )
        options = Conn_Options( Idx );
 
        strcpy( option_txt, "F" );      /* No idea what this means but the original ircd sends it ... */
-#ifdef USE_ZLIB
+#ifdef ZLIB
        if( options & CONN_ZIP ) strcat( option_txt, "z" );
 #endif