From dea38eb94661d795370220b34f8e24cbbb493f5b Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 6 Oct 2018 21:38:09 +0000
Subject: [PATCH] Fix problem reported by Lord Time (Rob Starr): With the
 change to smblib of March 14 (smbstr.c 1.29), netaddr_type() will parse
 generic words as QWK-network addresses. The fix here is to only attempt a
 net-type lookup if the 'to' field contains an '@'.

---
 web/root/msgs/savemsg.ssjs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/root/msgs/savemsg.ssjs b/web/root/msgs/savemsg.ssjs
index 7a8ef63940..1ac70ce8e5 100644
--- a/web/root/msgs/savemsg.ssjs
+++ b/web/root/msgs/savemsg.ssjs
@@ -25,11 +25,13 @@ if(sub!='mail')  {
 	}
 }
 else {
-	hdrs.to_net_type=netaddr_type(to);
+	hdrs.to_net_type = NET_NONE;
+    var at = to.indexOf('@');
+    if(at > 0)
+		hdrs.to_net_type=netaddr_type(to);
 	if(hdrs.to_net_type!=NET_NONE) {
 		if(user.security.restrictions&UFLAG_M)
 			error("You do not have permission to send netmail");
-        var at = to.indexOf('@');
         if(hdrs.to_net_type!=NET_INTERNET && at > 0) {
             hdrs.to_net_addr = to.slice(at + 1);
             to = to.slice(0, at);
-- 
GitLab