diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c index f52eac3fa622b35540682662a52680a992deb1a9..5e174815ff3d460d58696c242769b8571ecd1387 100644 --- a/src/sbbs3/mailsrvr.c +++ b/src/sbbs3/mailsrvr.c @@ -81,7 +81,6 @@ static char* badrsp_err = "%s replied with:\r\n\"%s\"\r\n" #define TIMEOUT_THREAD_WAIT 60 /* Seconds */ #define DNSBL_THROTTLE_VALUE 1000 /* Milliseconds */ -#define SPAM_HASH_SUBJECT_MIN_LEN 10 /* characters */ #define STATUS_WFC "Listening" @@ -2988,8 +2987,6 @@ static void smtp_thread(void* arg) if((dnsbl_recvhdr || dnsbl_result.s_addr) && startup->options&MAIL_OPT_DNSBL_SPAMHASH) is_spam=TRUE; - if(msg.subj==NULL || strlen(msg.subj) < SPAM_HASH_SUBJECT_MIN_LEN) - sources&=~(1<<SMB_HASH_SOURCE_SUBJECT); lprintf(LOG_DEBUG,"%04d SMTP Calculating message hashes (sources=%lx, msglen=%u)" ,socket, sources, strlen(msgbuf)); if((hashes=smb_msghashes(&msg, (uchar*)msgbuf, sources)) != NULL) { diff --git a/src/smblib/smbdefs.h b/src/smblib/smbdefs.h index 127a7055f790ff760a8573d7ca30926959438fb3..551751a9e91a03dd05cf9ed25708319aef6d55e6 100644 --- a/src/smblib/smbdefs.h +++ b/src/smblib/smbdefs.h @@ -8,7 +8,7 @@ * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * * - * Copyright 2012 Rob Swindell - http://www.synchro.net/copyright.html * + * Copyright 2013 Rob Swindell - http://www.synchro.net/copyright.html * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * @@ -479,7 +479,7 @@ enum { /* These are the hash sources stored/compared for duplicate message detection: */ #define SMB_HASH_SOURCE_DUPE ((1<<SMB_HASH_SOURCE_BODY)|(1<<SMB_HASH_SOURCE_MSG_ID)|(1<<SMB_HASH_SOURCE_FTN_ID)) /* These are the hash sources stored/compared for SPAM message detection: */ -#define SMB_HASH_SOURCE_SPAM ((1<<SMB_HASH_SOURCE_BODY)|(1<<SMB_HASH_SOURCE_SUBJECT)) +#define SMB_HASH_SOURCE_SPAM ((1<<SMB_HASH_SOURCE_BODY)) typedef struct _PACK {