X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..e8a2d50da8b13eeea02a534d7df948482bd5c003:/src/client.c?ds=sidebyside

diff --git a/src/client.c b/src/client.c
index eea5429..29e2fed 100644
--- a/src/client.c
+++ b/src/client.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: client.c 1861 2006-08-26 23:21:42Z jilles $
+ *  $Id: client.c 3319 2007-03-29 20:03:06Z jilles $
  */
 #include "stdinc.h"
 #include "config.h"
@@ -1422,7 +1422,9 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 	dlinkDelete(&source_p->localClient->tnode, &unknown_list);
 
 	if(!IsIOError(source_p))
-		sendto_one(source_p, "ERROR :Closing Link: 127.0.0.1 (%s)", comment);
+		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
+			source_p->user != NULL ? source_p->host : "127.0.0.1",
+			comment);
 
 	close_connection(source_p);
 
@@ -1552,12 +1554,6 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 			   source_p->name, comment);
 	}
 	
-	if(source_p->localClient->ctrlfd >= 0)
-	{
-		comm_close(source_p->localClient->ctrlfd);
-		source_p->localClient->ctrlfd = -1;
-	}
-
 	if(source_p->servptr && source_p->servptr->serv)
 		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
 	else
@@ -2103,13 +2099,10 @@ close_connection(struct Client *client_p)
 		client_p->localClient->fd = -1;
 	}
 
-	if(HasServlink(client_p))
+	if(-1 < client_p->localClient->ctrlfd)
 	{
-		if(client_p->localClient->fd > -1)
-		{
-			comm_close(client_p->localClient->ctrlfd);
-			client_p->localClient->ctrlfd = -1;
-		}
+		comm_close(client_p->localClient->ctrlfd);
+		client_p->localClient->ctrlfd = -1;
 	}
 
 	linebuf_donebuf(&client_p->localClient->buf_sendq);