- Log( LOG_NOTICE, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client ));
-
- Client_SetType( Client, CLIENT_SERVER );
-
- /* maximalen Hop Count ermitteln */
- max_hops = 0;
- c = Client_First( );
- while( c )
- {
- if( Client_Hops( c ) > max_hops ) max_hops = Client_Hops( c );
- c = Client_Next( c );
- }
-
- /* Alle bisherigen Server dem neuen Server bekannt machen,
- * die bisherigen Server ueber den neuen informierenn */
- for( i = 0; i < ( max_hops + 1 ); i++ )
- {
- c = Client_First( );
- while( c )
- {
- if(( Client_Type( c ) == CLIENT_SERVER ) && ( c != Client ) && ( c != Client_ThisServer( )) && ( Client_Hops( c ) == i ))
- {
- if( Client_Conn( c ) > NONE )
- {
- /* Dem gefundenen Server gleich den neuen
- * Server bekannt machen */
- if( ! IRC_WriteStrClient( c, "SERVER %s %d %d :%s", Client_ID( Client ), Client_Hops( Client ) + 1, Client_MyToken( Client ), Client_Info( Client ))) return DISCONNECTED;
- }
-
- /* Den neuen Server ueber den alten informieren */
- if( ! IRC_WriteStrClientPrefix( Client, Client_Hops( c ) == 1 ? Client_ThisServer( ) : Client_Introducer( c ), "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ))) return DISCONNECTED;
- }
- c = Client_Next( c );
+ /* Is this server registering on our side, or are we connecting to
+ * a remote server? */
+ con = Client_Conn(Client);
+ if (Client_Token(Client) != TOKEN_OUTBOUND) {
+ /* Incoming connection, send user/pass */
+ if (!IRC_WriteStrClient(Client, "PASS %s %s",
+ Conf_Server[i].pwd_out,
+ NGIRCd_ProtoID)
+ || !IRC_WriteStrClient(Client, "SERVER %s 1 :%s",
+ Conf_ServerName,
+ Conf_ServerInfo)) {
+ Conn_Close(con, "Unexpected server behavior!",
+ NULL, false);
+ return DISCONNECTED;