From: Alexander Barton <alex@barton.de>
Date: Mon, 2 Sep 2013 14:37:50 +0000 (+0200)
Subject: Only log "IDENT ... no result" when IDENT was looked up
X-Git-Tag: rel-21-rc1~26
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=4102e8fdfea33a5d8c398c98db90914c5dc29610

Only log "IDENT ... no result" when IDENT was looked up

Without this patch, ngIRCd logged the "IDENT lookup for connection X:
no result"-message even when IDENT lookups have been disabled using the
"Ident = no" configuration option, which is a little bit misleading.

Reported by "btwe" in #ngircd.
---

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 8d72c1c3..3b092787 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -2454,9 +2454,9 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
 					*ptr ? "" : ": ",
 					*ptr ? "" : identptr);
 			}
-		} else {
+		} else if(Conf_Ident) {
 			Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
-			if (Conf_NoticeAuth && Conf_Ident)
+			if (Conf_NoticeAuth)
 				(void)Conn_WriteStr(i,
 					"NOTICE AUTH :*** No ident response");
 		}