From ada2bdeb73ed3498df3ca018dedce1358d722b3f Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 9 Dec 2009 19:00:36 +0000
Subject: [PATCH] Log the connected host name (if host name lookups are
enabled) - again.
---
src/sbbs3/ftpsrvr.c | 8 +-------
src/sbbs3/mailsrvr.c | 6 ++++++
src/sbbs3/main.cpp | 8 +-------
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 595219e80f..74798b3893 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -2473,14 +2473,8 @@ static void ctrl_thread(void* arg)
else
host_name="<no name>";
-#if 0 /* gethostbyaddr() is apparently not (always) thread-safe
- and getnameinfo() doesn't return alias information */
- if(!(startup->options&FTP_OPT_NO_HOST_LOOKUP)) {
+ if(!(startup->options&FTP_OPT_NO_HOST_LOOKUP))
lprintf(LOG_INFO,"%04d Hostname: %s", sock, host_name);
- for(i=0;host!=NULL && host->h_aliases!=NULL && host->h_aliases[i]!=NULL;i++)
- lprintf(LOG_INFO,"%04d HostAlias: %s", sock, host->h_aliases[i]);
- }
-#endif
if(trashcan(&scfg,host_ip,"ip")) {
lprintf(LOG_NOTICE,"%04d !CLIENT BLOCKED in ip.can: %s", sock, host_ip);
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 98e7ac139b..65a778c487 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -766,6 +766,9 @@ static void pop3_thread(void* arg)
else
strcpy(host_name,"<no name>");
+ if(!(startup->options&MAIL_OPT_NO_HOST_LOOKUP))
+ lprintf(LOG_INFO,"%04d POP3 Hostname: %s", socket, host_name);
+
if(trashcan(&scfg,host_ip,"ip")) {
lprintf(LOG_NOTICE,"%04d !POP3 CLIENT IP ADDRESS BLOCKED: %s"
,socket, host_ip);
@@ -2299,6 +2302,9 @@ static void smtp_thread(void* arg)
else
strcpy(host_name,"<no name>");
+ if(!(startup->options&MAIL_OPT_NO_HOST_LOOKUP))
+ lprintf(LOG_INFO,"%04d SMTP Hostname: %s", socket, host_name);
+
active_clients++, update_clients();
SAFECOPY(hello_name,host_name);
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 31ae2428f7..f119c9e766 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -5097,14 +5097,8 @@ NO_SSH:
else
host_name="<no name>";
-#if 0 /* gethostbyaddr() is apparently not (always) thread-safe
- and getnameinfo() doesn't return alias information */
- if(!(startup->options&BBS_OPT_NO_HOST_LOOKUP)) {
+ if(!(startup->options&BBS_OPT_NO_HOST_LOOKUP))
lprintf(LOG_INFO,"%04d Hostname: %s", client_socket, host_name);
- for(i=0;h!=NULL && h->h_aliases!=NULL && h->h_aliases[i]!=NULL;i++)
- lprintf(LOG_INFO,"%04d HostAlias: %s", client_socket, h->h_aliases[i]);
- }
-#endif
if(sbbs->trashcan(host_name,"host")) {
SSH_END();
--
GitLab