Merge branch 'hs/fix-proxy-bh' (Closes 2656)

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

diff --git a/test/confs/2600 b/test/confs/2600
index 566e260f2d21e64e05493aeb5bc746e984b2344b..29f5afbbedb9850bb2f7460f23ee8fb5153dcf57 100644 (file)
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -7,13 +7,22 @@ primary_hostname = myhost.test.ex
 # ----- Main settings -----
 
 domainlist local_domains = @
 # ----- Main settings -----
 
 domainlist local_domains = @

+.ifdef OPT
+hostlist   relay_hosts = sqlite,file=DIR/aux-fixed/sqlitedb; \
+                                     select * from them where \
+                                     id='$sender_host_address'
+.else

 hostlist   relay_hosts = sqlite;DIR/aux-fixed/sqlitedb \
                                      select * from them where \
                                      id='$sender_host_address'
 hostlist   relay_hosts = sqlite;DIR/aux-fixed/sqlitedb \
                                      select * from them where \
                                      id='$sender_host_address'

+.endif

 
 acl_smtp_rcpt = check_recipient
 sqlite_lock_timeout = 2
 
 
 acl_smtp_rcpt = check_recipient
 sqlite_lock_timeout = 2
 

+.ifdef DATA
+sqlite_dbfile = DATA
+.endif

 
 # ----- ACL -----
 
 
 # ----- ACL -----