From 45bcd5acf471e88aca7636b1d1150dfc476cba30 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sun, 1 Apr 2018 07:51:09 +0000
Subject: [PATCH] If the SSH or RLogin-supplied username is in the name.can,
 don't start the new user signup process with that name (just fall-through to
 a normal login prompt).

---
 src/sbbs3/answer.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/sbbs3/answer.cpp b/src/sbbs3/answer.cpp
index cba4b8335d..251c87cfd5 100644
--- a/src/sbbs3/answer.cpp
+++ b/src/sbbs3/answer.cpp
@@ -423,8 +423,13 @@ bool sbbs_t::answer()
 	SAFECOPY(client_ipaddr, cid);	/* Over-ride IP address with Caller-ID info */
 	SAFECOPY(useron.comp,client_name);
 
-	if(!useron.number && rlogin_name[0]!=0 && !(cfg.sys_misc&SM_CLOSED) && !matchuser(&cfg, rlogin_name, /* Sysop alias: */FALSE)) {
-		lprintf(LOG_INFO,"Node %d UNKNOWN %s-specified username: '%s', starting new user signup",cfg.node_num,client.protocol,rlogin_name);
+	if(!useron.number 
+		&& rlogin_name[0]!=0 
+		&& !(cfg.sys_misc&SM_CLOSED) 
+		&& !matchuser(&cfg, rlogin_name, /* Sysop alias: */FALSE)
+		&& !::trashcan(&cfg, rlogin_name, "name")) {
+		lprintf(LOG_INFO, "Node %d UNKNOWN %s-specified username: '%s', starting new user signup"
+			,cfg.node_num,client.protocol,rlogin_name);
 		bprintf("%s: %s\r\n", text[UNKNOWN_USER], rlogin_name);
 		newuser();
 	}
-- 
GitLab