--- exim-4.14/src/exiscan.h.orig Mon Mar 17 16:55:31 2003 +++ exim-4.14/src/exiscan.h Mon Mar 17 22:26:39 2003 @@ -35,13 +35,23 @@ /* Error texts to be returned to the sender */ -#define ERROR_TEMPORARY_PROBLEM "Temporary local problem (%s)." -#define ERROR_ALREADY_SCANNED "Message already scanned (previous ID was %s)." -#define ERROR_BROKEN_MIME "This message contains a broken MIME container (%s)." -#define ERROR_CONTAINS_VIRUS "This message contains a virus or other harmful content (%s)." -#define ERROR_CONTAINS_FILE "This message contains a file with a blacklisted extension (%s)." -#define ERROR_CONTAINS_REGEX "This message matches a blacklisted regular expression (%s)." -#define ERROR_CONTAINS_SPAM "This message scored %s spam points." +#define ERROR_EXT_TEMPORARY_PROBLEM "Temporary local problem" +#define ERROR_EXT_ALREADY_SCANNED "Message already scanned (previous ID was %s)." +#define ERROR_EXT_BROKEN_MIME "This message contains a broken MIME container (%s)." +#define ERROR_EXT_CONTAINS_VIRUS "This message contains a virus or other harmful content (%s)." +#define ERROR_EXT_CONTAINS_FILE "This message contains a file with a blacklisted extension (%s)." +#define ERROR_EXT_CONTAINS_REGEX "This message matches a blacklisted regular expression (%s)." +#define ERROR_EXT_CONTAINS_SPAM "This message scored %s spam points." + +/* Error texts to be logged internally */ + +#define ERROR_INT_TEMPORARY_PROBLEM "Temporary local problem - %s" +#define ERROR_INT_ALREADY_SCANNED "Message already scanned (previous ID was %s)." +#define ERROR_INT_BROKEN_MIME "This message contains a broken MIME container (%s)." +#define ERROR_INT_CONTAINS_VIRUS "This message contains a virus or other harmful content (%s)." +#define ERROR_INT_CONTAINS_FILE "This message contains a file with a blacklisted extension (%s)." +#define ERROR_INT_CONTAINS_REGEX "This message matches a blacklisted regular expression (%s)." +#define ERROR_INT_CONTAINS_SPAM "This message scored %s spam points." /* misc default texts */