Fix debug message "Client ... is closing connection"

[ngircd-alex.git] / src / ngircd / conn.c

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index daf496b4186a58d3f43ba8c22339918a318e05e1..edcd868efba8b30a6113897b6f94df18db18b6b7 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1487,7 +1487,7 @@ Conn_StartLogin(CONN_ID Idx)
                ident_sock = My_Connections[Idx].sock;
 #endif
 
-       if (Conf_NoticeAuth) {
+       if (Conf_NoticeBeforeRegistration) {
                /* Send "NOTICE *" messages to the client */
 #ifdef IDENTAUTH
                if (Conf_Ident)
@@ -1583,7 +1583,7 @@ Read_Request( CONN_ID Idx )
        if (len == 0) {
                LogDebug("Client \"%s:%u\" is closing connection %d ...",
                         My_Connections[Idx].host,
-                        ng_ipaddr_tostr(&My_Connections[Idx].addr), Idx);
+                        ng_ipaddr_getport(&My_Connections[Idx].addr), Idx);
                Conn_Close(Idx, NULL, "Client closed connection", false);
                return;
        }
@@ -2265,7 +2265,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
                strlcpy(My_Connections[i].host, readbuf,
                        sizeof(My_Connections[i].host));
                Client_SetHostname(c, readbuf);
-               if (Conf_NoticeAuth)
+               if (Conf_NoticeBeforeRegistration)
                        (void)Conn_WriteStr(i,
                                        "NOTICE * :*** Found your hostname: %s",
                                        My_Connections[i].host);
@@ -2291,7 +2291,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
                                    i, identptr);
                                Client_SetUser(c, identptr, true);
                        }
-                       if (Conf_NoticeAuth) {
+                       if (Conf_NoticeBeforeRegistration) {
                                (void)Conn_WriteStr(i,
                                        "NOTICE * :*** Got %sident response%s%s",
                                        *ptr ? "invalid " : "",
@@ -2300,13 +2300,13 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
                        }
                } else if(Conf_Ident) {
                        Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
-                       if (Conf_NoticeAuth)
+                       if (Conf_NoticeBeforeRegistration)
                                (void)Conn_WriteStr(i,
                                        "NOTICE * :*** No ident response");
                }
 #endif
 
-               if (Conf_NoticeAuth) {
+               if (Conf_NoticeBeforeRegistration) {
                        /* Send buffered data to the client, but break on
                         * errors because Handle_Write() would have closed
                         * the connection again in this case! */