From c45fbe1bb3092060bd258b3975d7218ee34402af Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sat, 3 Nov 2012 21:04:07 +0100 Subject: [PATCH] Remove identd text event coz it doesn't work --- src/common/identd.c | 8 ++++++++ src/common/text.c | 2 ++ src/common/textevents.in | 6 ------ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/identd.c b/src/common/identd.c index 4ffaf23b..5cfc536f 100644 --- a/src/common/identd.c +++ b/src/common/identd.c @@ -58,7 +58,11 @@ identd (char *username) identd_is_running = FALSE; +#if 0 /* causes random crashes, probably due to CreateThread */ EMIT_SIGNAL (XP_TE_IDENTD, current_sess, inet_ntoa (addr.sin_addr), username, NULL, NULL, 0); +#endif + snprintf (outbuf, sizeof (outbuf), "*\tServicing ident request from %s as %s\n", inet_ntoa (addr.sin_addr), username); + PrintText (current_sess, outbuf); recv (read_sok, buf, sizeof (buf) - 1, 0); buf[sizeof (buf) - 1] = 0; /* ensure null termination */ @@ -141,7 +145,11 @@ identd_ipv6 (char *username) snprintf (ipv6buf, sizeof (ipv6buf) - 1, "[SOCKET ERROR: 0x%X]", WSAGetLastError ()); } +#if 0 /* causes random crashes, probably due to CreateThread */ EMIT_SIGNAL (XP_TE_IDENTD, current_sess, ipv6buf, username, NULL, NULL, 0); +#endif + snprintf (outbuf, sizeof (outbuf), "*\tServicing ident request from %s as %s\n", ipv6buf, username); + PrintText (current_sess, outbuf); recv (read_sok, buf, sizeof (buf) - 1, 0); buf[sizeof (buf) - 1] = 0; /* ensure null termination */ diff --git a/src/common/text.c b/src/common/text.c index 63e4717f..6d69b08c 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -1143,10 +1143,12 @@ static char * const pevt_genmsg_help[] = { N_("Right message"), }; +#if 0 static char * const pevt_identd_help[] = { N_("IP address"), N_("Username") }; +#endif static char * const pevt_join_help[] = { N_("The nick of the joining person"), diff --git a/src/common/textevents.in b/src/common/textevents.in index 8576438d..58e986f7 100644 --- a/src/common/textevents.in +++ b/src/common/textevents.in @@ -424,12 +424,6 @@ pevt_genmsg_help $1$t$2 n2 -Identd -XP_TE_IDENTD -pevt_identd_help -%C23*%O$tServicing ident request from %C23$1%O as %C18$2%O -2 - Ignore Add XP_TE_IGNOREADD pevt_ignoreaddremove_help