Remove Client_DestroyNow() to keep semantik "every CONNECTON has a CLIENT".

 client.c |   33 ---------------------------------
 client.h |    3 ---
 conn.c   |   10 +---------
 3 files changed, 1 insertion(+), 45 deletions(-)

Index: src/ngircd/client.c
===================================================================
RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/client.c,v
retrieving revision 1.94
diff -u -p -r1.94 client.c
--- src/ngircd/client.c	7 Dec 2006 22:24:14 -0000	1.94
+++ src/ngircd/client.c	23 Jan 2007 15:55:51 -0000
@@ -68,10 +68,6 @@ static CLIENT *Init_New_Client PARAMS((C
  CLIENT *TopServer, int Type, char *ID, char *User, char *Hostname,
  char *Info, int Hops, int Token, char *Modes, bool Idented));
 
-#ifndef Client_DestroyNow
-GLOBAL void Client_DestroyNow PARAMS((CLIENT *Client ));
-#endif
-
 
 long Max_Users = 0, My_Max_Users = 0;
 
@@ -337,35 +333,6 @@ Client_Destroy( CLIENT *Client, char *Lo
 
 
 GLOBAL void
-Client_DestroyNow( CLIENT *Client )
-{
-	/* Destroy client structure immediately. This function is only
-	 * intended for the connection layer to remove client structures
-	 * of connections that can't be established! */
-
-	CLIENT *last, *c;
-
-	assert( Client != NULL );
-
-	last = NULL;
-	c = My_Clients;
-	while( c )
-	{
-		if( c == Client )
-		{
-			/* Wir haben den Client gefunden: entfernen */
-			if( last ) last->next = c->next;
-			else My_Clients = (CLIENT *)c->next;
-			free( c );
-			break;
-		}
-		last = c;
-		c = (CLIENT *)c->next;
-	}
-} /* Client_DestroyNow */
-
-
-GLOBAL void
 Client_SetHostname( CLIENT *Client, char *Hostname )
 {
 	/* Hostname eines Clients setzen */
Index: src/ngircd/client.h
===================================================================
RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/client.h,v
retrieving revision 1.45
diff -u -p -r1.45 client.h
--- src/ngircd/client.h	7 Oct 2006 10:40:52 -0000	1.45
+++ src/ngircd/client.h	23 Jan 2007 15:55:52 -0000
@@ -80,9 +80,6 @@ GLOBAL CLIENT *Client_NewRemoteServer PA
 GLOBAL CLIENT *Client_NewRemoteUser PARAMS(( CLIENT *Introducer, char *Nick, int Hops, char *User, char *Hostname, int Token, char *Modes, char *Info, bool Idented ));
 
 GLOBAL void Client_Destroy PARAMS(( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit ));
-#ifdef CONN_MODULE
-GLOBAL void Client_DestroyNow PARAMS(( CLIENT *Client ));
-#endif
 
 GLOBAL CLIENT *Client_ThisServer PARAMS(( void ));
 
Index: src/ngircd/conn.c
===================================================================
RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/conn.c,v
retrieving revision 1.201
diff -u -p -r1.201 conn.c
--- src/ngircd/conn.c	25 Dec 2006 01:11:12 -0000	1.201
+++ src/ngircd/conn.c	23 Jan 2007 15:55:54 -0000
@@ -123,7 +123,6 @@ cb_connserver(int sock, UNUSED short wha
 {
 	int res, err;
 	socklen_t sock_len;
-	CLIENT *c;
 	CONN_ID idx = Socket2Index( sock );
 	if (idx <= NONE) {
 		LogDebug("cb_connserver wants to write on unknown socket?!");
@@ -150,14 +149,7 @@ cb_connserver(int sock, UNUSED short wha
  			    Conf_Server[Conf_GetServer(idx)].port,
  			    idx, strerror(err));
 
-		/* Clean up the CLIENT structure (to avoid silly log
- 		 * messages) and call Conn_Close() to do the rest. */
- 		c = Conn_GetClient(idx);
- 		if (c)
-			Client_DestroyNow(c);
- 
- 		Conn_Close(idx, "Can't connect!", NULL, false);
- 
+		Conn_Close(idx, "Can't connect!", NULL, false);
 		return;
 	}