- Fehler-Ausgaben verbessert (Prefix-Fehler).

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

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index dcfa2d7254373a01c7c3f4b5651f7841488a44aa..86b22e14ba284b4fda123aab2787b04d7ed99753 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-login.c,v 1.19 2002/09/03 20:39:54 alex Exp $
+ * $Id: irc-login.c,v 1.22 2002/09/22 21:40:33 alex Exp $
  *
  * irc-login.c: Anmeldung und Abmeldung im IRC
  */
@@ -65,7 +65,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
        }
        else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
        {
-               CHAR c, *type, *impl, *serverver, *flags, *ptr;
+               CHAR c2, c4, *type, *impl, *serverver, *flags, *ptr;
                INT protohigh, protolow;
 
                /* noch nicht registrierte Server-Verbindung */
@@ -77,14 +77,16 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
                /* Protokollversion ermitteln */
                if( strlen( Req->argv[1] ) >= 4 )
                {
-                       c = Req->argv[1][4];
+                       c2 = Req->argv[1][2];
+                       c4 = Req->argv[1][4];
+
                        Req->argv[1][4] = '\0';
-                       
                        protolow = atoi( &Req->argv[1][2] );
                        Req->argv[1][2] = '\0';
                        protohigh = atoi( Req->argv[1] );
                        
-                       Req->argv[1][4] = c;
+                       Req->argv[1][2] = c2;
+                       Req->argv[1][4] = c4;
                }                       
                else protohigh = protolow = 0;
 
@@ -109,12 +111,12 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
                                flags++;
                        }
                        else flags = "";
-                       Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s (flags: \"%s\") using protocol version %d.%d+.", Client_Conn( Client ), impl, serverver, flags, protohigh, protolow );
+                       Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", Client_Conn( Client ), impl, serverver, protohigh, protolow, flags );
                }
                else
                {
                        serverver = flags = "";
-                       Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol version %d.%d.", Client_Conn( Client ), impl, protohigh, protolow );
+                       Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol %d.%d.", Client_Conn( Client ), impl, protohigh, protolow );
                }
 
                Client_SetType( Client, CLIENT_GOTPASSSERVER );
@@ -439,7 +441,7 @@ Hello_User( CLIENT *Client )
        IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client ));
 
        if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE;
-       if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_CPU, TARGET_OS )) return FALSE;
+       if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return FALSE;
        if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE;
        if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE;