Fix non-TLS build

[users/heiko/exim.git] / test / confs / 4000

diff --git a/test/confs/4000 b/test/confs/4000
index 1b33ff795d50922d0da6b4e71bb695e444a5eaf7..d80aaa8f1febcc436cb958ae445b05745b2d3539 100644 (file)
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,53 +1,26 @@
 # Exim test configuration 4000
 
 # Exim test configuration 4000
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +subject

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 
 # ----- Main settings -----
 
 
 
 # ----- Main settings -----
 

-acl_smtp_rcpt = check_rcpt
-acl_smtp_data = check_data
-acl_not_smtp  = check_data
+acl_smtp_rcpt = accept

 acl_smtp_mime = check_mime
 acl_smtp_mime = check_mime

-acl_not_smtp_mime = check_mime
-
-av_scanner = clamd:CLAMSOCKET

 
 
 # ----- ACL -----
 
 begin acl
 
 
 
 # ----- ACL -----
 
 begin acl
 

-check_rcpt:
-  accept
-
-check_data:
-  deny     message = Found $malware_name
-           malware = *
-
-  warn     spam    = nobody
-
-  warn     set acl_m0 = $spam_score_int
-
-  warn     message = X-Regex: Regex matched
-           regex   = THIS REGEX
-
-  warn     condition = ${if !eq{$h_fakereject:}{}}
-           control   = fakereject
-
-  warn     condition = ${if !eq{$h_fakedefer:}{}}
-           control   = fakedefer
-
-  accept
-

 check_mime:
 check_mime:

+.ifdef BAD
+  deny    message =    this is a deny from the mime acl
+.endif
+

   warn     decode  = default
            add_header = X-$mime_part_count-content-type: $mime_content_type\n\
                         X-$mime_part_count-filename: $mime_filename\n\
   warn     decode  = default
            add_header = X-$mime_part_count-content-type: $mime_content_type\n\
                         X-$mime_part_count-filename: $mime_filename\n\


@@ -62,7 +35,6 @@ check_mime:
                         X-$mime_part_count-is-rfc822: $mime_is_rfc822\n\
                         X-$mime_part_count-decode-filename: $mime_decoded_filename\n\
                         X-$mime_part_count-content-size: $mime_content_size
                         X-$mime_part_count-is-rfc822: $mime_is_rfc822\n\
                         X-$mime_part_count-decode-filename: $mime_decoded_filename\n\
                         X-$mime_part_count-content-size: $mime_content_size

-

   accept
 
 
   accept
 
 


@@ -73,10 +45,6 @@ begin routers
 r1:
   driver = accept
   transport = t1
 r1:
   driver = accept
   transport = t1

-  headers_add = X-Router-SSint: \
-                ${if eq {$spam_score_int}{$acl_m0}\
-                {was preserved}{was not preserver}}
-

 
 # ----- Transports -----
 
 
 # ----- Transports -----
 


@@ -84,7 +52,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 
   user = CALLER