commit - 3be7b9ef59cf7425c87e4b44c7345287eb13c425
commit + 7f795915223bb416fafc6b00f161c410a0a22b76
blob - 93998f5937874c0c7322afb0262d331d678ac9f3
blob + a23788c23ea41871a34d68d70e50f7029c5ae6cf
--- src/ngircd/irc-login.c
+++ 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.12 2002/04/08 16:37:50 alex Exp $
+ * $Id: irc-login.c,v 1.13 2002/04/14 14:02:35 alex Exp $
  *
  * irc-login.c: Anmeldung und Abmeldung im IRC
  */
@@ -251,20 +251,8 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req 
 	
 	assert( Client != NULL );
 	assert( Req != NULL );
-
-	if(( Client_Type( Client ) == CLIENT_USER ) || ( Client_Type( Client ) == CLIENT_SERVICE ))
-	{
-		/* User / Service */
-		
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-		if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE );
-		else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE );
-		
-		return DISCONNECTED;
-	}
-	else if ( Client_Type( Client ) == CLIENT_SERVER )
+	if ( Client_Type( Client ) == CLIENT_SERVER )
 	{
 		/* Server */
 
@@ -284,7 +272,18 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req 
 
 		return CONNECTED;
 	}
-	else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+	else
+	{
+		/* User, Service, oder noch nicht registriert */
+		
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+		if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE );
+		else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE );
+		
+		return DISCONNECTED;
+	}
 } /* IRC_QUIT */