[exim-cvs] Disable identd (rfc1413) lookups by default

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Disable identd (rfc1413) lookups by default
Gitweb: http://git.exim.org/exim.git/commitdiff/f926e27276301de1e2fd011b7edcd1b85d8c4754
Commit:     f926e27276301de1e2fd011b7edcd1b85d8c4754
Parent:     712240406dff5ac02645003ce1ea40b70a3080ac
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Dec 23 19:50:07 2014 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jan 12 18:58:35 2015 +0000


    Disable identd (rfc1413) lookups by default
---
 doc/doc-docbook/spec.xfpt |   10 ++++++----
 doc/doc-txt/ChangeLog     |    3 +++
 src/src/configure.default |   25 +++++++++++++------------
 src/src/globals.c         |    4 ++--
 test/confs/0001           |    1 -
 test/confs/0002           |    1 -
 test/confs/0003           |    1 -
 test/confs/0004           |    1 -
 test/confs/0005           |    1 -
 test/confs/0006           |    1 -
 test/confs/0007           |    1 -
 test/confs/0008           |    1 -
 test/confs/0009           |    1 -
 test/confs/0010           |    1 -
 test/confs/0011           |    1 -
 test/confs/0012           |    1 -
 test/confs/0013           |    1 -
 test/confs/0014           |    1 -
 test/confs/0015           |    1 -
 test/confs/0016           |    1 -
 test/confs/0017           |    1 -
 test/confs/0018           |    1 -
 test/confs/0019           |    1 -
 test/confs/0020           |    1 -
 test/confs/0021           |    1 -
 test/confs/0022           |    1 -
 test/confs/0023           |    1 -
 test/confs/0024           |    1 -
 test/confs/0025           |    1 -
 test/confs/0026           |    1 -
 test/confs/0027           |    1 -
 test/confs/0028           |    1 -
 test/confs/0029           |    1 -
 test/confs/0030           |    1 -
 test/confs/0031           |    1 -
 test/confs/0032           |    1 -
 test/confs/0033           |    1 -
 test/confs/0034           |    1 -
 test/confs/0035           |    1 -
 test/confs/0036           |    1 -
 test/confs/0037           |    1 -
 test/confs/0038           |    1 -
 test/confs/0039           |    1 -
 test/confs/0040           |    1 -
 test/confs/0041           |    1 -
 test/confs/0042           |    1 -
 test/confs/0043           |    1 -
 test/confs/0044           |    1 -
 test/confs/0045           |    1 -
 test/confs/0046           |    1 -
 test/confs/0047           |    1 -
 test/confs/0048           |    1 -
 test/confs/0049           |    1 -
 test/confs/0050           |    1 -
 test/confs/0051           |    1 -
 test/confs/0052           |    1 -
 test/confs/0053           |    1 -
 test/confs/0054           |    1 -
 test/confs/0055           |    1 -
 test/confs/0056           |    1 -
 test/confs/0057           |    1 -
 test/confs/0058           |    1 -
 test/confs/0059           |    1 -
 test/confs/0060           |    1 -
 test/confs/0061           |    1 -
 test/confs/0062           |    1 -
 test/confs/0063           |    1 -
 test/confs/0064           |    1 -
 test/confs/0065           |    1 -
 test/confs/0066           |    1 -
 test/confs/0067           |    1 -
 test/confs/0068           |    1 -
 test/confs/0069           |    1 -
 test/confs/0070           |    1 -
 test/confs/0071           |    1 -
 test/confs/0072           |    1 -
 test/confs/0073           |    1 -
 test/confs/0074           |    1 -
 test/confs/0075           |    1 -
 test/confs/0076           |    1 -
 test/confs/0077           |    1 -
 test/confs/0078           |    1 -
 test/confs/0079           |    1 -
 test/confs/0080           |    1 -
 test/confs/0081           |    1 -
 test/confs/0082           |    1 -
 test/confs/0083           |    1 -
 test/confs/0084           |    1 -
 test/confs/0085           |    1 -
 test/confs/0086           |    1 -
 test/confs/0087           |    1 -
 test/confs/0088           |    1 -
 test/confs/0089           |    1 -
 test/confs/0090           |    1 -
 test/confs/0091           |    1 -
 test/confs/0092           |    1 -
 test/confs/0093           |    1 -
 test/confs/0094           |    1 -
 test/confs/0095           |    1 -
 test/confs/0096           |    1 -
 test/confs/0097           |    1 -
 test/confs/0098           |    1 -
 test/confs/0099           |    1 -
 test/confs/0100           |    1 -
 test/confs/0101           |    1 -
 test/confs/0102           |    1 -
 test/confs/0103           |    1 -
 test/confs/0104           |    1 -
 test/confs/0105           |    1 -
 test/confs/0106           |    1 -
 test/confs/0107           |    1 -
 test/confs/0108           |    1 -
 test/confs/0109           |    1 -
 test/confs/0110           |    1 -
 test/confs/0111           |    1 -
 test/confs/0112           |    1 -
 test/confs/0113           |    1 -
 test/confs/0114           |    1 -
 test/confs/0115           |    1 -
 test/confs/0116           |    1 -
 test/confs/0117           |    1 -
 test/confs/0118           |    1 -
 test/confs/0119           |    1 -
 test/confs/0120           |    1 -
 test/confs/0121           |    1 -
 test/confs/0122           |    1 -
 test/confs/0123           |    1 -
 test/confs/0124           |    1 -
 test/confs/0125           |    1 -
 test/confs/0126           |    1 -
 test/confs/0127           |    1 -
 test/confs/0128           |    1 -
 test/confs/0129           |    1 -
 test/confs/0130           |    1 -
 test/confs/0131           |    1 -
 test/confs/0132           |    1 -
 test/confs/0133           |    1 -
 test/confs/0134           |    1 -
 test/confs/0135           |    1 -
 test/confs/0136           |    1 -
 test/confs/0137           |    1 -
 test/confs/0138           |    1 -
 test/confs/0139           |    1 -
 test/confs/0140           |    1 -
 test/confs/0141           |    1 -
 test/confs/0142           |    1 -
 test/confs/0143           |    1 -
 test/confs/0144           |    1 -
 test/confs/0145           |    1 -
 test/confs/0146           |    1 -
 test/confs/0147           |    1 -
 test/confs/0148           |    1 -
 test/confs/0149           |    1 -
 test/confs/0150           |    1 -
 test/confs/0151           |    1 -
 test/confs/0152           |    1 -
 test/confs/0153           |    1 -
 test/confs/0154           |    1 -
 test/confs/0155           |    1 -
 test/confs/0156           |    1 -
 test/confs/0157           |    1 -
 test/confs/0158           |    1 -
 test/confs/0159           |    1 -
 test/confs/0160           |    1 -
 test/confs/0161           |    1 -
 test/confs/0162           |    1 -
 test/confs/0163           |    1 -
 test/confs/0164           |    1 -
 test/confs/0165           |    1 -
 test/confs/0166           |    1 -
 test/confs/0167           |    1 -
 test/confs/0168           |    1 -
 test/confs/0169           |    1 -
 test/confs/0170           |    1 -
 test/confs/0171           |    1 -
 test/confs/0172           |    1 -
 test/confs/0173           |    1 -
 test/confs/0174           |    1 -
 test/confs/0175           |    1 -
 test/confs/0176           |    1 -
 test/confs/0177           |    1 -
 test/confs/0178           |    1 -
 test/confs/0179           |    1 -
 test/confs/0180           |    1 -
 test/confs/0181           |    1 -
 test/confs/0182           |    1 -
 test/confs/0183           |    1 -
 test/confs/0184           |    1 -
 test/confs/0185           |    1 -
 test/confs/0186           |    1 -
 test/confs/0187           |    1 -
 test/confs/0188           |    1 -
 test/confs/0189           |    1 -
 test/confs/0190           |    1 -
 test/confs/0191           |    1 -
 test/confs/0192           |    1 -
 test/confs/0193           |    1 -
 test/confs/0194           |    1 -
 test/confs/0195           |    1 -
 test/confs/0196           |    1 -
 test/confs/0197           |    1 -
 test/confs/0198           |    1 -
 test/confs/0199           |    1 -
 test/confs/0200           |    1 -
 test/confs/0201           |    1 -
 test/confs/0202           |    1 -
 test/confs/0203           |    1 -
 test/confs/0204           |    1 -
 test/confs/0205           |    1 -
 test/confs/0206           |    1 -
 test/confs/0207           |    1 -
 test/confs/0208           |    1 -
 test/confs/0209           |    1 -
 test/confs/0210           |    1 -
 test/confs/0211           |    1 -
 test/confs/0212           |    1 -
 test/confs/0213           |    1 -
 test/confs/0214           |    1 -
 test/confs/0215           |    1 -
 test/confs/0216           |    1 -
 test/confs/0217           |    1 -
 test/confs/0218           |    1 -
 test/confs/0219           |    1 -
 test/confs/0220           |    1 -
 test/confs/0221           |    1 -
 test/confs/0222           |    1 -
 test/confs/0223           |    1 -
 test/confs/0224           |    1 -
 test/confs/0225           |    1 -
 test/confs/0226           |    1 -
 test/confs/0227           |    1 -
 test/confs/0228           |    1 -
 test/confs/0229           |    1 -
 test/confs/0230           |    1 -
 test/confs/0231           |    1 -
 test/confs/0232           |    1 -
 test/confs/0233           |    1 -
 test/confs/0234           |    1 -
 test/confs/0235           |    1 -
 test/confs/0236           |    1 -
 test/confs/0237           |    1 -
 test/confs/0238           |    1 -
 test/confs/0239           |    1 -
 test/confs/0240           |    1 -
 test/confs/0241           |    1 -
 test/confs/0242           |    1 -
 test/confs/0243           |    1 -
 test/confs/0244           |    1 -
 test/confs/0245           |    1 -
 test/confs/0246           |    1 -
 test/confs/0247           |    1 -
 test/confs/0248           |    1 -
 test/confs/0249           |    1 -
 test/confs/0250           |    1 -
 test/confs/0251           |    1 -
 test/confs/0252           |    1 -
 test/confs/0253           |    1 -
 test/confs/0254           |    1 -
 test/confs/0255           |    1 -
 test/confs/0256           |    1 -
 test/confs/0257           |    1 -
 test/confs/0258           |    1 -
 test/confs/0259           |    1 +
 test/confs/0260           |    1 -
 test/confs/0261           |    1 -
 test/confs/0262           |    1 -
 test/confs/0263           |    1 -
 test/confs/0264           |    1 -
 test/confs/0265           |    1 -
 test/confs/0266           |    1 -
 test/confs/0267           |    1 -
 test/confs/0268           |    1 -
 test/confs/0269           |    1 -
 test/confs/0270           |    1 -
 test/confs/0271           |    1 -
 test/confs/0272           |    1 -
 test/confs/0273           |    1 -
 test/confs/0274           |    1 -
 test/confs/0275           |    1 -
 test/confs/0276           |    1 -
 test/confs/0277           |    1 -
 test/confs/0278           |    1 -
 test/confs/0279           |    1 -
 test/confs/0280           |    1 -
 test/confs/0281           |    1 -
 test/confs/0282           |    1 -
 test/confs/0283           |    1 -
 test/confs/0284           |    1 -
 test/confs/0285           |    1 -
 test/confs/0286           |    1 -
 test/confs/0287           |    1 -
 test/confs/0288           |    1 -
 test/confs/0289           |    1 -
 test/confs/0290           |    1 -
 test/confs/0291           |    1 -
 test/confs/0292           |    1 -
 test/confs/0293           |    1 -
 test/confs/0294           |    1 -
 test/confs/0295           |    1 -
 test/confs/0296           |    1 -
 test/confs/0297           |    1 -
 test/confs/0298           |    1 -
 test/confs/0299           |    1 -
 test/confs/0300           |    1 -
 test/confs/0301           |    1 -
 test/confs/0302           |    1 -
 test/confs/0303           |    1 -
 test/confs/0304           |    1 -
 test/confs/0305           |    1 -
 test/confs/0306           |    1 -
 test/confs/0307           |    1 -
 test/confs/0308           |    1 -
 test/confs/0309           |    1 -
 test/confs/0310           |    1 -
 test/confs/0311           |    1 -
 test/confs/0312           |    1 -
 test/confs/0313           |    1 -
 test/confs/0314           |    1 -
 test/confs/0315           |    1 -
 test/confs/0316           |    1 -
 test/confs/0317           |    1 -
 test/confs/0318           |    1 -
 test/confs/0319           |    1 -
 test/confs/0320           |    1 -
 test/confs/0321           |    1 -
 test/confs/0322           |    1 -
 test/confs/0323           |    1 -
 test/confs/0324           |    1 -
 test/confs/0325           |    1 -
 test/confs/0326           |    1 -
 test/confs/0327           |    1 -
 test/confs/0328           |    1 -
 test/confs/0329           |    1 -
 test/confs/0330           |    1 -
 test/confs/0331           |    1 -
 test/confs/0332           |    1 -
 test/confs/0333           |    1 -
 test/confs/0334           |    1 -
 test/confs/0335           |    1 -
 test/confs/0336           |    1 -
 test/confs/0337           |    1 -
 test/confs/0338           |    1 -
 test/confs/0339           |    1 -
 test/confs/0340           |    1 -
 test/confs/0341           |    1 -
 test/confs/0342           |    1 -
 test/confs/0343           |    1 -
 test/confs/0344           |    1 -
 test/confs/0345           |    1 -
 test/confs/0346           |    1 -
 test/confs/0347           |    1 -
 test/confs/0348           |    1 -
 test/confs/0349           |    1 -
 test/confs/0350           |    1 -
 test/confs/0351           |    1 -
 test/confs/0352           |    1 -
 test/confs/0353           |    1 -
 test/confs/0354           |    1 -
 test/confs/0355           |    1 -
 test/confs/0356           |    1 -
 test/confs/0357           |    1 -
 test/confs/0358           |    1 -
 test/confs/0359           |    1 -
 test/confs/0360           |    1 -
 test/confs/0361           |    1 -
 test/confs/0362           |    1 -
 test/confs/0363           |    1 -
 test/confs/0364           |    1 -
 test/confs/0365           |    1 -
 test/confs/0366           |    1 -
 test/confs/0367           |    1 -
 test/confs/0368           |    1 -
 test/confs/0369           |    1 -
 test/confs/0370           |    1 -
 test/confs/0371           |    1 -
 test/confs/0372           |    1 -
 test/confs/0373           |    1 -
 test/confs/0374           |    1 -
 test/confs/0375           |    1 -
 test/confs/0376           |    1 -
 test/confs/0377           |    1 -
 test/confs/0378           |    1 -
 test/confs/0379           |    1 -
 test/confs/0380           |    1 -
 test/confs/0381           |    1 -
 test/confs/0382           |    1 -
 test/confs/0383           |    1 -
 test/confs/0384           |    1 -
 test/confs/0385           |    1 -
 test/confs/0386           |    1 -
 test/confs/0387           |    1 -
 test/confs/0388           |    1 -
 test/confs/0389           |    1 -
 test/confs/0390           |    1 -
 test/confs/0391           |    1 -
 test/confs/0392           |    1 -
 test/confs/0393           |    1 -
 test/confs/0394           |    1 -
 test/confs/0395           |    1 -
 test/confs/0396           |    1 -
 test/confs/0397           |    1 -
 test/confs/0398           |    1 -
 test/confs/0399           |    1 -
 test/confs/0400           |    1 -
 test/confs/0401           |    1 -
 test/confs/0402           |    1 -
 test/confs/0403           |    1 -
 test/confs/0404           |    1 -
 test/confs/0405           |    1 -
 test/confs/0406           |    1 -
 test/confs/0407           |    1 -
 test/confs/0408           |    1 -
 test/confs/0409           |    1 -
 test/confs/0410           |    1 -
 test/confs/0411           |    1 -
 test/confs/0412           |    1 -
 test/confs/0413           |    1 -
 test/confs/0414           |    1 -
 test/confs/0415           |    1 -
 test/confs/0416           |    1 -
 test/confs/0417           |    1 -
 test/confs/0418           |    1 -
 test/confs/0419           |    1 -
 test/confs/0420           |    1 -
 test/confs/0421           |    1 -
 test/confs/0422           |    1 -
 test/confs/0423           |    1 -
 test/confs/0424           |    1 -
 test/confs/0425           |    1 -
 test/confs/0426           |    1 -
 test/confs/0427           |    1 -
 test/confs/0428           |    1 -
 test/confs/0429           |    1 -
 test/confs/0430           |    1 -
 test/confs/0431           |    1 -
 test/confs/0432           |    1 -
 test/confs/0433           |    1 -
 test/confs/0434           |    1 -
 test/confs/0435           |    1 -
 test/confs/0436           |    1 -
 test/confs/0437           |    1 -
 test/confs/0438           |    1 -
 test/confs/0439           |    1 -
 test/confs/0440           |    1 -
 test/confs/0441           |    1 -
 test/confs/0442           |    1 -
 test/confs/0443           |    1 -
 test/confs/0444           |    1 -
 test/confs/0445           |    1 -
 test/confs/0446           |    1 -
 test/confs/0447           |    1 -
 test/confs/0448           |    1 -
 test/confs/0449           |    1 -
 test/confs/0450           |    1 -
 test/confs/0451           |    1 -
 test/confs/0452           |    1 -
 test/confs/0453           |    1 -
 test/confs/0454           |    1 -
 test/confs/0455           |    1 -
 test/confs/0456           |    1 -
 test/confs/0457           |    1 -
 test/confs/0458           |    1 -
 test/confs/0459           |    1 -
 test/confs/0460           |    1 -
 test/confs/0461           |    1 -
 test/confs/0462           |    1 -
 test/confs/0463           |    1 -
 test/confs/0464           |    1 -
 test/confs/0465           |    1 -
 test/confs/0466           |    1 -
 test/confs/0467           |    1 -
 test/confs/0468           |    1 -
 test/confs/0469           |    1 -
 test/confs/0470           |    1 -
 test/confs/0471           |    1 -
 test/confs/0472           |    1 -
 test/confs/0473           |    1 -
 test/confs/0474           |    1 -
 test/confs/0475           |    1 -
 test/confs/0476           |    1 -
 test/confs/0477           |    1 -
 test/confs/0478           |    1 -
 test/confs/0479           |    1 -
 test/confs/0480           |    1 -
 test/confs/0481           |    1 -
 test/confs/0482           |    1 -
 test/confs/0483           |    1 -
 test/confs/0484           |    1 -
 test/confs/0485           |    1 -
 test/confs/0486           |    1 -
 test/confs/0487           |    1 -
 test/confs/0488           |    1 -
 test/confs/0489           |    1 -
 test/confs/0490           |    1 -
 test/confs/0491           |    1 -
 test/confs/0492           |    1 -
 test/confs/0493           |    1 -
 test/confs/0494           |    1 -
 test/confs/0495           |    1 -
 test/confs/0496           |    1 -
 test/confs/0497           |    1 -
 test/confs/0498           |    1 -
 test/confs/0499           |    1 -
 test/confs/0500           |    1 -
 test/confs/0501           |    1 -
 test/confs/0502           |    1 -
 test/confs/0503           |    1 -
 test/confs/0504           |    1 -
 test/confs/0505           |    1 -
 test/confs/0506           |    1 -
 test/confs/0507           |    1 -
 test/confs/0508           |    1 -
 test/confs/0509           |    1 -
 test/confs/0510           |    1 -
 test/confs/0511           |    1 -
 test/confs/0512           |    1 -
 test/confs/0513           |    1 -
 test/confs/0514           |    1 -
 test/confs/0515           |    1 -
 test/confs/0516           |    1 -
 test/confs/0517           |    1 -
 test/confs/0518           |    1 -
 test/confs/0519           |    1 -
 test/confs/0520           |    1 -
 test/confs/0521           |    1 -
 test/confs/0522           |    1 -
 test/confs/0523           |    1 -
 test/confs/0524           |    1 -
 test/confs/0525           |    1 -
 test/confs/0526           |    1 -
 test/confs/0527           |    1 -
 test/confs/0528           |    1 -
 test/confs/0529           |    1 -
 test/confs/0530           |    1 -
 test/confs/0531           |    1 -
 test/confs/0532           |    1 -
 test/confs/0533           |    1 -
 test/confs/0534           |    1 -
 test/confs/0535           |    1 -
 test/confs/0536           |    1 -
 test/confs/0537           |    1 -
 test/confs/0538           |    1 -
 test/confs/0539           |    1 -
 test/confs/0540           |    1 -
 test/confs/0541           |    1 -
 test/confs/0542           |    1 -
 test/confs/0543           |    1 -
 test/confs/0544           |    1 -
 test/confs/0545           |    1 -
 test/confs/0546           |    1 -
 test/confs/0547           |    1 -
 test/confs/0548           |    1 -
 test/confs/0549           |    1 -
 test/confs/0550           |    1 -
 test/confs/0551           |    1 -
 test/confs/0552           |    1 -
 test/confs/0553           |    1 -
 test/confs/0554           |    1 -
 test/confs/0555           |    1 -
 test/confs/0556           |    1 -
 test/confs/0557           |    1 -
 test/confs/0558           |    1 -
 test/confs/0559           |    1 -
 test/confs/0560           |    1 -
 test/confs/0561           |    1 -
 test/confs/0562           |    1 -
 test/confs/0564           |    1 -
 test/confs/0565           |    1 -
 test/confs/0566           |    1 -
 test/confs/0567           |    1 -
 test/confs/0569           |    1 -
 test/confs/0570           |    1 -
 test/confs/0600           |    1 -
 test/confs/1000           |    1 -
 test/confs/1001           |    1 -
 test/confs/1002           |    1 -
 test/confs/1003           |    1 -
 test/confs/1005           |    1 -
 test/confs/1006           |    1 -
 test/confs/1007           |    1 -
 test/confs/1008           |    1 -
 test/confs/1009           |    1 -
 test/confs/1010           |    1 -
 test/confs/2000           |    1 -
 test/confs/2001           |    1 -
 test/confs/2002           |    1 -
 test/confs/2003           |    1 -
 test/confs/2004           |    1 -
 test/confs/2005           |    1 -
 test/confs/2006           |    1 -
 test/confs/2007           |    1 -
 test/confs/2008           |    1 -
 test/confs/2009           |    1 -
 test/confs/2010           |    1 -
 test/confs/2012           |    1 -
 test/confs/2013           |    1 -
 test/confs/2014           |    1 -
 test/confs/2015           |    1 -
 test/confs/2016           |    1 -
 test/confs/2017           |    1 -
 test/confs/2018           |    1 -
 test/confs/2019           |    1 -
 test/confs/2020           |    1 -
 test/confs/2021           |    1 -
 test/confs/2022           |    1 -
 test/confs/2023           |    1 -
 test/confs/2024           |    1 -
 test/confs/2025           |    1 -
 test/confs/2026           |    1 -
 test/confs/2027           |    1 -
 test/confs/2028           |    1 -
 test/confs/2029           |    1 -
 test/confs/2030           |    1 -
 test/confs/2031           |    1 -
 test/confs/2032           |    1 -
 test/confs/2100           |    1 -
 test/confs/2101           |    1 -
 test/confs/2102           |    1 -
 test/confs/2103           |    1 -
 test/confs/2104           |    1 -
 test/confs/2105           |    1 -
 test/confs/2106           |    1 -
 test/confs/2107           |    1 -
 test/confs/2108           |    1 -
 test/confs/2109           |    1 -
 test/confs/2110           |    1 -
 test/confs/2111           |    1 -
 test/confs/2112           |    1 -
 test/confs/2113           |    1 -
 test/confs/2114           |    1 -
 test/confs/2115           |    1 -
 test/confs/2116           |    1 -
 test/confs/2117           |    1 -
 test/confs/2118           |    1 -
 test/confs/2119           |    1 -
 test/confs/2120           |    1 -
 test/confs/2121           |    1 -
 test/confs/2122           |    1 -
 test/confs/2123           |    1 -
 test/confs/2124           |    1 -
 test/confs/2125           |    1 -
 test/confs/2126           |    1 -
 test/confs/2127           |    1 -
 test/confs/2128           |    1 -
 test/confs/2130           |    1 -
 test/confs/2131           |    1 -
 test/confs/2132           |    1 -
 test/confs/2149           |    1 -
 test/confs/2150           |    1 -
 test/confs/2200           |    1 -
 test/confs/2201           |    1 -
 test/confs/2202           |    1 -
 test/confs/2250           |    1 -
 test/confs/2300           |    1 -
 test/confs/2400           |    1 -
 test/confs/2500           |    1 -
 test/confs/2501           |    1 -
 test/confs/2600           |    1 -
 test/confs/3000           |    1 -
 test/confs/3100           |    1 -
 test/confs/3200           |    1 -
 test/confs/3201           |    1 -
 test/confs/3202           |    1 -
 test/confs/3203           |    1 -
 test/confs/3204           |    1 -
 test/confs/3205           |    1 -
 test/confs/3206           |    1 -
 test/confs/3207           |    1 -
 test/confs/3208           |    1 -
 test/confs/3209           |    1 -
 test/confs/3210           |    1 -
 test/confs/3211           |    1 -
 test/confs/3212           |    1 -
 test/confs/3213           |    1 -
 test/confs/3300           |    1 -
 test/confs/3400           |    1 -
 test/confs/3401           |    1 -
 test/confs/3402           |    1 -
 test/confs/3403           |    1 -
 test/confs/3404           |    1 -
 test/confs/3405           |    1 -
 test/confs/3406           |    1 -
 test/confs/3407           |    1 -
 test/confs/3408           |    1 -
 test/confs/3409           |    1 -
 test/confs/3410           |    1 -
 test/confs/3411           |    1 -
 test/confs/3412           |    1 -
 test/confs/3413           |    1 -
 test/confs/3414           |    1 -
 test/confs/3415           |    1 -
 test/confs/3416           |    1 -
 test/confs/3450           |    1 -
 test/confs/3451           |    1 -
 test/confs/3452           |    1 -
 test/confs/3453           |    1 -
 test/confs/3454           |    1 -
 test/confs/3455           |    1 -
 test/confs/3460           |    1 -
 test/confs/3461           |    1 -
 test/confs/3462           |    1 -
 test/confs/3463           |    1 -
 test/confs/3464           |    1 -
 test/confs/3465           |    1 -
 test/confs/3500           |    1 -
 test/confs/3501           |    1 -
 test/confs/3600           |    1 -
 test/confs/4000           |    1 -
 test/confs/4100           |    1 -
 test/confs/4950           |    1 -
 test/confs/5000           |    1 -
 test/confs/5001           |    1 -
 test/confs/5002           |    1 -
 test/confs/5003           |    1 -
 test/confs/5004           |    1 -
 test/confs/5005           |    1 -
 test/confs/5006           |    1 -
 test/confs/5007           |    1 -
 test/confs/5008           |    1 -
 test/confs/5009           |    1 -
 test/confs/5050           |    1 -
 test/confs/5100           |    1 -
 test/confs/5101           |    1 -
 test/confs/5102           |    1 -
 test/confs/5103           |    1 -
 test/confs/5200           |    1 -
 test/confs/5201           |    1 -
 test/confs/5202           |    1 -
 test/confs/5203           |    1 -
 test/confs/5204           |    1 -
 test/confs/5205           |    1 -
 test/confs/5206           |    1 -
 test/confs/5207           |    1 -
 test/confs/5208           |    1 -
 test/confs/5209           |    1 -
 test/confs/5300           |    1 -
 test/confs/5301           |    1 -
 test/confs/5400           |    1 -
 test/confs/5401           |    1 -
 test/confs/5410           |    1 -
 test/confs/5420           |    1 -
 test/confs/5440           |    1 -
 test/confs/5450           |    1 -
 test/confs/5500           |    1 -
 test/confs/5510           |    1 -
 test/confs/5600           |    1 -
 test/confs/5601           |    1 -
 test/confs/5608           |    1 -
 test/confs/5650           |    1 -
 test/confs/5651           |    1 -
 test/confs/5658           |    1 -
 test/confs/5700           |    1 -
 test/confs/5750           |    1 -
 test/confs/5760           |    1 -
 test/confs/5820           |    1 -
 test/confs/5840           |    1 -
 test/confs/5860           |    1 -
 test/confs/9000           |    1 -
 test/confs/9001           |    1 -
 test/confs/9100           |    1 -
 test/confs/9200           |    1 -
 test/confs/9300           |    1 -
 test/confs/9350           |    1 -
 test/confs/9400           |    1 -
 test/confs/9401           |    1 -
 test/confs/9402           |    1 -
 test/confs/9450           |    1 -
 test/confs/9900           |    1 -
 test/confs/9901           |    1 -
 test/confs/9902           |    1 -
 test/confs/9903           |    1 -
 test/paniclog/0013        |    2 +-
 test/paniclog/0148        |    2 +-
 test/paniclog/0236        |    2 +-
 test/paniclog/0290        |    2 +-
 test/paniclog/0348        |    8 ++++----
 test/paniclog/0415        |   20 ++++++++++----------
 test/paniclog/0442        |    2 +-
 test/stderr/0013          |    2 +-
 test/stderr/0148          |    2 +-
 test/stderr/0236          |    2 +-
 test/stderr/0290          |    2 +-
 test/stderr/0348          |    8 ++++----
 test/stderr/0415          |   20 ++++++++++----------
 test/stderr/0442          |    2 +-
 785 files changed, 63 insertions(+), 822 deletions(-)


diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 1486b00..3419b76 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -15642,13 +15642,15 @@ the time of delivery. They are normally used only for final local deliveries.
This option is an obsolete synonym for &%bounce_return_size_limit%&.


-.option rfc1413_hosts main "host list&!!" *
+.option rfc1413_hosts main "host list&!!" @[]
.cindex "RFC 1413"
.cindex "host" "for RFC 1413 calls"
-RFC 1413 identification calls are made to any client host which matches an item
-in the list.
+RFC 1413 identification calls are made to any client host which matches
+an item in the list.
+The default value specifies just this host, being any local interface
+for the system.

-.option rfc1413_query_timeout main time 5s
+.option rfc1413_query_timeout main time 0s
 .cindex "RFC 1413" "query timeout"
 .cindex "timeout" "for RFC 1413 call"
 This sets the timeout on RFC 1413 identification calls. If it is set to zero,
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 49059a7..cef9c16 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -26,6 +26,9 @@ JH/06 Verification of the server certificate for a TLS connection is now tried
       default, for both outbound TLS and client-certificate supplying inbound
       TLS connections


+JH/07 Changed the default rfc1413 lookup settings to disable calls.  Few
+      sites use this now.
+


Exim version 4.85
-----------------
diff --git a/src/src/configure.default b/src/src/configure.default
index 1274349..c16221f 100644
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -221,18 +221,19 @@ never_users = root
host_lookup = *


-# The settings below, which are actually the same as the defaults in the
-# code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP
-# calls. You can limit the hosts to which these calls are made, and/or change
-# the timeout that is used. If you set the timeout to zero, all RFC 1413 calls
-# are disabled. RFC 1413 calls are cheap and can provide useful information
-# for tracing problem messages, but some hosts and firewalls have problems
-# with them. This can result in a timeout instead of an immediate refused
-# connection, leading to delays on starting up SMTP sessions. (The default was
-# reduced from 30s to 5s for release 4.61.)
-
-rfc1413_hosts = *
-rfc1413_query_timeout = 5s
+# The settings below cause Exim to make RFC 1413 (ident) callbacks
+# for all incoming SMTP calls. You can limit the hosts to which these
+# calls are made, and/or change the timeout that is used. If you set
+# the timeout to zero, all RFC 1413 calls are disabled. RFC 1413 calls
+# are cheap and can provide useful information for tracing problem
+# messages, but some hosts and firewalls have problems with them.
+# This can result in a timeout instead of an immediate refused
+# connection, leading to delays on starting up SMTP sessions.
+# (The default was reduced from 30s to 5s for release 4.61. and to
+# disabled for release 4.86)
+#
+#rfc1413_hosts = *
+#rfc1413_query_timeout = 5s


 # By default, Exim expects all envelope addresses to be fully qualified, that
diff --git a/src/src/globals.c b/src/src/globals.c
index 5cd738b..8cdfb0e 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1076,8 +1076,8 @@ retry_config  *retries         = NULL;
 uschar *return_path            = NULL;
 BOOL    return_path_remove     = TRUE;
 int     rewrite_existflags     = 0;
-uschar *rfc1413_hosts          = US"*";
-int     rfc1413_query_timeout  = 5;
+uschar *rfc1413_hosts          = US"@[]";
+int     rfc1413_query_timeout  = 0;
 /* BOOL    rfc821_domains         = FALSE;  <<< on the way out */
 uid_t   root_gid               = ROOT_GID;
 uid_t   root_uid               = ROOT_UID;
diff --git a/test/confs/0001 b/test/confs/0001
index 14db5ae..ab9ad45 100644
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -6,7 +6,6 @@


exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0002 b/test/confs/0002
index 409bd75..a6a1581 100644
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -6,7 +6,6 @@ PTBC=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0003 b/test/confs/0003
index 53ae390..5c1382c 100644
--- a/test/confs/0003
+++ b/test/confs/0003
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0004 b/test/confs/0004
index 606ab51..5db3d6a 100644
--- a/test/confs/0004
+++ b/test/confs/0004
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0005 b/test/confs/0005
index d4e976e..f7d5b80 100644
--- a/test/confs/0005
+++ b/test/confs/0005
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0006 b/test/confs/0006
index 59ecb0e..3f5c25d 100644
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0007 b/test/confs/0007
index 1dc7f57..5e01e1d 100644
--- a/test/confs/0007
+++ b/test/confs/0007
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0008 b/test/confs/0008
index 2c6b341..bf2d5b0 100644
--- a/test/confs/0008
+++ b/test/confs/0008
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0009 b/test/confs/0009
index 0d944c9..2049f10 100644
--- a/test/confs/0009
+++ b/test/confs/0009
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0010 b/test/confs/0010
index f39a50b..466b97c 100644
--- a/test/confs/0010
+++ b/test/confs/0010
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0011 b/test/confs/0011
index ca101e0..36aa777 100644
--- a/test/confs/0011
+++ b/test/confs/0011
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0012 b/test/confs/0012
index 4e1d473..f554c9f 100644
--- a/test/confs/0012
+++ b/test/confs/0012
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0013 b/test/confs/0013
index 70cd8d6..08f976a 100644
--- a/test/confs/0013
+++ b/test/confs/0013
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0014 b/test/confs/0014
index c7dbdb8..9785f5f 100644
--- a/test/confs/0014
+++ b/test/confs/0014
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0015 b/test/confs/0015
index fbfa534..e563755 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0016 b/test/confs/0016
index 2d5a9df..5d9d99f 100644
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0017 b/test/confs/0017
index 48c3e9c..9a9c200 100644
--- a/test/confs/0017
+++ b/test/confs/0017
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0018 b/test/confs/0018
index 7d6437a..170a4c1 100644
--- a/test/confs/0018
+++ b/test/confs/0018
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0019 b/test/confs/0019
index 442ada6..6143a4d 100644
--- a/test/confs/0019
+++ b/test/confs/0019
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0020 b/test/confs/0020
index c31f5e6..14fadcd 100644
--- a/test/confs/0020
+++ b/test/confs/0020
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0021 b/test/confs/0021
index da92933..96dccd4 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -6,7 +6,6 @@ BR=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0022 b/test/confs/0022
index 5fa25b0..38a844c 100644
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0023 b/test/confs/0023
index 4f79a87..2e5e15c 100644
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -5,7 +5,6 @@ LOG_SELECTOR=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0024 b/test/confs/0024
index 52a2351..a701975 100644
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0025 b/test/confs/0025
index 658dcb9..f17e0d5 100644
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0026 b/test/confs/0026
index 5a0c04e..db267d5 100644
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0027 b/test/confs/0027
index 8fe398b..36116e8 100644
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0028 b/test/confs/0028
index 6cb607e..23d6c93 100644
--- a/test/confs/0028
+++ b/test/confs/0028
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0029 b/test/confs/0029
index d0c6708..353415c 100644
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0030 b/test/confs/0030
index 5534918..c2ba7ab 100644
--- a/test/confs/0030
+++ b/test/confs/0030
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0031 b/test/confs/0031
index 15cd541..d4452ac 100644
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0032 b/test/confs/0032
index fc2f22c..9d2a025 100644
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0033 b/test/confs/0033
index 6b455fa..aef4591 100644
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0034 b/test/confs/0034
index 5fbb0b3..8317a0c 100644
--- a/test/confs/0034
+++ b/test/confs/0034
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0035 b/test/confs/0035
index 38b377b..a591b75 100644
--- a/test/confs/0035
+++ b/test/confs/0035
@@ -6,7 +6,6 @@ SUBMISSION_OPTIONS=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0036 b/test/confs/0036
index 83997b3..218de7b 100644
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0037 b/test/confs/0037
index ad855ec..84385f0 100644
--- a/test/confs/0037
+++ b/test/confs/0037
@@ -4,7 +4,6 @@ FILTER_PREPEND_HOME=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0038 b/test/confs/0038
index e407994..6c4c332 100644
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -7,7 +7,6 @@ ACLRCPT=check_rcpt
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0039 b/test/confs/0039
index 3d98941..36a7d50 100644
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -5,7 +5,6 @@ QDG=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0040 b/test/confs/0040
index 4607d53..c686bcc 100644
--- a/test/confs/0040
+++ b/test/confs/0040
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0041 b/test/confs/0041
index fa488e5..996e322 100644
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0042 b/test/confs/0042
index 4d994e4..8a38474 100644
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0043 b/test/confs/0043
index b8d1c9a..301bee4 100644
--- a/test/confs/0043
+++ b/test/confs/0043
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0044 b/test/confs/0044
index ef431f2..9229443 100644
--- a/test/confs/0044
+++ b/test/confs/0044
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0045 b/test/confs/0045
index d6674dc..f60aec0 100644
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0046 b/test/confs/0046
index c70121b..3c70acc 100644
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -4,7 +4,6 @@ NL=FALSE

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0047 b/test/confs/0047
index 7695652..1e59305 100644
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0048 b/test/confs/0048
index c0086e4..374dbaf 100644
--- a/test/confs/0048
+++ b/test/confs/0048
@@ -4,7 +4,6 @@ MESSAGE_LOGS = true

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0049 b/test/confs/0049
index 7966e03..e2b7279 100644
--- a/test/confs/0049
+++ b/test/confs/0049
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0050 b/test/confs/0050
index db87e29..8bcfdba 100644
--- a/test/confs/0050
+++ b/test/confs/0050
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0051 b/test/confs/0051
index 018aa95..8e11e71 100644
--- a/test/confs/0051
+++ b/test/confs/0051
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0052 b/test/confs/0052
index f483cfe..34c0598 100644
--- a/test/confs/0052
+++ b/test/confs/0052
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0053 b/test/confs/0053
index 58f6a72..646eee9 100644
--- a/test/confs/0053
+++ b/test/confs/0053
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0054 b/test/confs/0054
index aaddd49..1a0ddd3 100644
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0055 b/test/confs/0055
index 79b2ac3..9f1b008 100644
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0056 b/test/confs/0056
index 22375d0..51fa53b 100644
--- a/test/confs/0056
+++ b/test/confs/0056
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0057 b/test/confs/0057
index 3dd7183..37bb198 100644
--- a/test/confs/0057
+++ b/test/confs/0057
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0058 b/test/confs/0058
index c23b306..f095f37 100644
--- a/test/confs/0058
+++ b/test/confs/0058
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0059 b/test/confs/0059
index 33cf95f..b21c5ca 100644
--- a/test/confs/0059
+++ b/test/confs/0059
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0060 b/test/confs/0060
index 9561c8c..0bf8bc4 100644
--- a/test/confs/0060
+++ b/test/confs/0060
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0061 b/test/confs/0061
index b7f9a10..84d4149 100644
--- a/test/confs/0061
+++ b/test/confs/0061
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = ten-1.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0062 b/test/confs/0062
index e3a11ca..9becb26 100644
--- a/test/confs/0062
+++ b/test/confs/0062
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0063 b/test/confs/0063
index 4118128..d45c79c 100644
--- a/test/confs/0063
+++ b/test/confs/0063
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0064 b/test/confs/0064
index e824e66..d2de325 100644
--- a/test/confs/0064
+++ b/test/confs/0064
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0065 b/test/confs/0065
index 9525580..0f18c5e 100644
--- a/test/confs/0065
+++ b/test/confs/0065
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0066 b/test/confs/0066
index 67da001..8143b63 100644
--- a/test/confs/0066
+++ b/test/confs/0066
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0067 b/test/confs/0067
index 0094578..4d53f3a 100644
--- a/test/confs/0067
+++ b/test/confs/0067
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0068 b/test/confs/0068
index 0300bca..bc3e88d 100644
--- a/test/confs/0068
+++ b/test/confs/0068
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0069 b/test/confs/0069
index 4e1e70d..c03aa20 100644
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -5,7 +5,6 @@ LOG_SELECTOR=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0070 b/test/confs/0070
index 77ec017..768f7d6 100644
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -5,7 +5,6 @@ HVH=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0071 b/test/confs/0071
index e1d76d6..749781c 100644
--- a/test/confs/0071
+++ b/test/confs/0071
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0072 b/test/confs/0072
index 368db3c..110d3b1 100644
--- a/test/confs/0072
+++ b/test/confs/0072
@@ -6,7 +6,6 @@ RETURN=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0073 b/test/confs/0073
index 8bc9c7c..b394778 100644
--- a/test/confs/0073
+++ b/test/confs/0073
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0074 b/test/confs/0074
index 3fc4613..5153300 100644
--- a/test/confs/0074
+++ b/test/confs/0074
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0075 b/test/confs/0075
index 2a171ea..5ed1218 100644
--- a/test/confs/0075
+++ b/test/confs/0075
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0076 b/test/confs/0076
index fad78a5..e95ee98 100644
--- a/test/confs/0076
+++ b/test/confs/0076
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0077 b/test/confs/0077
index f5df43e..aef2fd6 100644
--- a/test/confs/0077
+++ b/test/confs/0077
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0078 b/test/confs/0078
index 870453d..a9e660a 100644
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0079 b/test/confs/0079
index 284f0b0..522c905 100644
--- a/test/confs/0079
+++ b/test/confs/0079
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0080 b/test/confs/0080
index 36f94f8..cb83d38 100644
--- a/test/confs/0080
+++ b/test/confs/0080
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0081 b/test/confs/0081
index 23e22a2..4bca680 100644
--- a/test/confs/0081
+++ b/test/confs/0081
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0082 b/test/confs/0082
index 489b9d7..b6fe0f4 100644
--- a/test/confs/0082
+++ b/test/confs/0082
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0083 b/test/confs/0083
index 20a106c..6cbb42e 100644
--- a/test/confs/0083
+++ b/test/confs/0083
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0084 b/test/confs/0084
index 395743c..30a8ccc 100644
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0085 b/test/confs/0085
index c2a3ebe..59bd0ee 100644
--- a/test/confs/0085
+++ b/test/confs/0085
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0086 b/test/confs/0086
index eb78548..2bf285a 100644
--- a/test/confs/0086
+++ b/test/confs/0086
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0087 b/test/confs/0087
index 4000be1..71cdc70 100644
--- a/test/confs/0087
+++ b/test/confs/0087
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0088 b/test/confs/0088
index ac956d3..96aaca6 100644
--- a/test/confs/0088
+++ b/test/confs/0088
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0089 b/test/confs/0089
index f075fdf..3b7f145 100644
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0090 b/test/confs/0090
index 4cb868f..ec524c8 100644
--- a/test/confs/0090
+++ b/test/confs/0090
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0091 b/test/confs/0091
index 1c2e057..c65a947 100644
--- a/test/confs/0091
+++ b/test/confs/0091
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0092 b/test/confs/0092
index 9c90978..15f1f5d 100644
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -10,7 +10,6 @@ domainlist relay_domains = test.ex
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0093 b/test/confs/0093
index 8d178ff..c8124fa 100644
--- a/test/confs/0093
+++ b/test/confs/0093
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0094 b/test/confs/0094
index f03987c..fd25acc 100644
--- a/test/confs/0094
+++ b/test/confs/0094
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0095 b/test/confs/0095
index c949415..f19bec7 100644
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -6,7 +6,6 @@ QWM=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0096 b/test/confs/0096
index a182a93..98ac5f8 100644
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0097 b/test/confs/0097
index ad88aee..9c4f7d9 100644
--- a/test/confs/0097
+++ b/test/confs/0097
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0098 b/test/confs/0098
index 07346c8..f23da44 100644
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -4,7 +4,6 @@ WMF=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0099 b/test/confs/0099
index 4a13b49..e54cf62 100644
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -4,7 +4,6 @@ RETRY =

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0100 b/test/confs/0100
index 948d807..6d78adf 100644
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0101 b/test/confs/0101
index 7d88395..ccee419 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0102 b/test/confs/0102
index dd17eb8..3b3e3d5 100644
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0103 b/test/confs/0103
index 7e459b4..bff294a 100644
--- a/test/confs/0103
+++ b/test/confs/0103
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0104 b/test/confs/0104
index cef5303..e6c15b8 100644
--- a/test/confs/0104
+++ b/test/confs/0104
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0105 b/test/confs/0105
index bdf0edd..73550b3 100644
--- a/test/confs/0105
+++ b/test/confs/0105
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0106 b/test/confs/0106
index d58ddea..bd7cb84 100644
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0107 b/test/confs/0107
index aba16e8..6fd34ce 100644
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0108 b/test/confs/0108
index 18ae758..bbcb3e5 100644
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0109 b/test/confs/0109
index f2ea8d2..d42a79d 100644
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0110 b/test/confs/0110
index c6ff8c3..b02cf59 100644
--- a/test/confs/0110
+++ b/test/confs/0110
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0111 b/test/confs/0111
index 0af1b33..cb95f57 100644
--- a/test/confs/0111
+++ b/test/confs/0111
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0112 b/test/confs/0112
index 2598c92..2b3b7bd 100644
--- a/test/confs/0112
+++ b/test/confs/0112
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0113 b/test/confs/0113
index c3f63d0..0d1240e 100644
--- a/test/confs/0113
+++ b/test/confs/0113
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0114 b/test/confs/0114
index 7e4a47c..8a4595f 100644
--- a/test/confs/0114
+++ b/test/confs/0114
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0115 b/test/confs/0115
index 1cf1197..3f5fb8b 100644
--- a/test/confs/0115
+++ b/test/confs/0115
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0116 b/test/confs/0116
index 42752c3..41aaf0d 100644
--- a/test/confs/0116
+++ b/test/confs/0116
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0117 b/test/confs/0117
index b9d57cf..11b9409 100644
--- a/test/confs/0117
+++ b/test/confs/0117
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0118 b/test/confs/0118
index f8d4268..bf517b1 100644
--- a/test/confs/0118
+++ b/test/confs/0118
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0119 b/test/confs/0119
index 337920d..a25646b 100644
--- a/test/confs/0119
+++ b/test/confs/0119
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0120 b/test/confs/0120
index 85c6b88..8fd162d 100644
--- a/test/confs/0120
+++ b/test/confs/0120
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0121 b/test/confs/0121
index 2984770..897c90a 100644
--- a/test/confs/0121
+++ b/test/confs/0121
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0122 b/test/confs/0122
index 44d1a4c..b8bc342 100644
--- a/test/confs/0122
+++ b/test/confs/0122
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0123 b/test/confs/0123
index 501af37..df35baf 100644
--- a/test/confs/0123
+++ b/test/confs/0123
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0124 b/test/confs/0124
index 33ea902..5f156e1 100644
--- a/test/confs/0124
+++ b/test/confs/0124
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0125 b/test/confs/0125
index 3ad7297..3b74967 100644
--- a/test/confs/0125
+++ b/test/confs/0125
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0126 b/test/confs/0126
index 226ba04..04583de 100644
--- a/test/confs/0126
+++ b/test/confs/0126
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0127 b/test/confs/0127
index 9493d33..3e95cf8 100644
--- a/test/confs/0127
+++ b/test/confs/0127
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0128 b/test/confs/0128
index 53ecd84..95271e3 100644
--- a/test/confs/0128
+++ b/test/confs/0128
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0129 b/test/confs/0129
index 1d6641d..b033914 100644
--- a/test/confs/0129
+++ b/test/confs/0129
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0130 b/test/confs/0130
index 3a81fe2..5ecdfc3 100644
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0131 b/test/confs/0131
index 4600569..50ae1db 100644
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0132 b/test/confs/0132
index 3b42392..0ed262a 100644
--- a/test/confs/0132
+++ b/test/confs/0132
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0133 b/test/confs/0133
index 11b2ab3..c432021 100644
--- a/test/confs/0133
+++ b/test/confs/0133
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0134 b/test/confs/0134
index 607c761..08519f3 100644
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0135 b/test/confs/0135
index 233d48b..4cef8c4 100644
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0136 b/test/confs/0136
index 7e0cfda..0144252 100644
--- a/test/confs/0136
+++ b/test/confs/0136
@@ -4,7 +4,6 @@ BRB=true

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0137 b/test/confs/0137
index b69bf64..45f3c44 100644
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0138 b/test/confs/0138
index 521dcd7..abe4665 100644
--- a/test/confs/0138
+++ b/test/confs/0138
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0139 b/test/confs/0139
index 5327de9..3a10b71 100644
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0140 b/test/confs/0140
index b228ba5..e3d0324 100644
--- a/test/confs/0140
+++ b/test/confs/0140
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0141 b/test/confs/0141
index 7ae9a70..275e7e3 100644
--- a/test/confs/0141
+++ b/test/confs/0141
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0142 b/test/confs/0142
index 1736e9a..672f0f4 100644
--- a/test/confs/0142
+++ b/test/confs/0142
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0143 b/test/confs/0143
index ad18789..e1dd55f 100644
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0144 b/test/confs/0144
index a0b6860..116416e 100644
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0145 b/test/confs/0145
index ed7b7bf..011b4c6 100644
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0146 b/test/confs/0146
index 34235d1..ae08e6a 100644
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0147 b/test/confs/0147
index 5243b7a..a7ad86b 100644
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -10,7 +10,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0148 b/test/confs/0148
index d2cf6d1..6a2a2f1 100644
--- a/test/confs/0148
+++ b/test/confs/0148
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0149 b/test/confs/0149
index f200efd..c652322 100644
--- a/test/confs/0149
+++ b/test/confs/0149
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0150 b/test/confs/0150
index 455d676..3bdb03f 100644
--- a/test/confs/0150
+++ b/test/confs/0150
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0151 b/test/confs/0151
index db4e56d..7f514cd 100644
--- a/test/confs/0151
+++ b/test/confs/0151
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0152 b/test/confs/0152
index 0cd2487..8272de7 100644
--- a/test/confs/0152
+++ b/test/confs/0152
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0153 b/test/confs/0153
index b604f9b..0a4b448 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0154 b/test/confs/0154
index c19c584..159d5e2 100644
--- a/test/confs/0154
+++ b/test/confs/0154
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0155 b/test/confs/0155
index 3e11245..cd8ee91 100644
--- a/test/confs/0155
+++ b/test/confs/0155
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0156 b/test/confs/0156
index f24a064..fcf969a 100644
--- a/test/confs/0156
+++ b/test/confs/0156
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0157 b/test/confs/0157
index 05dc9ee..2378965 100644
--- a/test/confs/0157
+++ b/test/confs/0157
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0158 b/test/confs/0158
index c59767d..06789cf 100644
--- a/test/confs/0158
+++ b/test/confs/0158
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0159 b/test/confs/0159
index c4f3dc5..64be164 100644
--- a/test/confs/0159
+++ b/test/confs/0159
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0160 b/test/confs/0160
index 48d493c..1edac2f 100644
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0161 b/test/confs/0161
index deb67e5..e5409f0 100644
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0162 b/test/confs/0162
index c898789..077b9a4 100644
--- a/test/confs/0162
+++ b/test/confs/0162
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0163 b/test/confs/0163
index 16d5292..4193741 100644
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0164 b/test/confs/0164
index bcc34bb..814ea81 100644
--- a/test/confs/0164
+++ b/test/confs/0164
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0165 b/test/confs/0165
index 050b75f..5db2c0a 100644
--- a/test/confs/0165
+++ b/test/confs/0165
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0166 b/test/confs/0166
index 7d2f066..c8c2031 100644
--- a/test/confs/0166
+++ b/test/confs/0166
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0167 b/test/confs/0167
index 1e88e6d..b74f1fa 100644
--- a/test/confs/0167
+++ b/test/confs/0167
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0168 b/test/confs/0168
index 8a6d133..01db843 100644
--- a/test/confs/0168
+++ b/test/confs/0168
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0169 b/test/confs/0169
index a09a3f5..6250465 100644
--- a/test/confs/0169
+++ b/test/confs/0169
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0170 b/test/confs/0170
index 87c9cce..e1f773a 100644
--- a/test/confs/0170
+++ b/test/confs/0170
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0171 b/test/confs/0171
index 0dceb88..05b023a 100644
--- a/test/confs/0171
+++ b/test/confs/0171
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0172 b/test/confs/0172
index 1772e90..ea4cc60 100644
--- a/test/confs/0172
+++ b/test/confs/0172
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0173 b/test/confs/0173
index 07763aa..ddde76c 100644
--- a/test/confs/0173
+++ b/test/confs/0173
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0174 b/test/confs/0174
index 012408e..31e11e8 100644
--- a/test/confs/0174
+++ b/test/confs/0174
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0175 b/test/confs/0175
index 7fba5b6..4f8be4f 100644
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0176 b/test/confs/0176
index 725973b..48bd6ec 100644
--- a/test/confs/0176
+++ b/test/confs/0176
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0177 b/test/confs/0177
index 273d0a7..4782202 100644
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0178 b/test/confs/0178
index f13ae20..647f5f8 100644
--- a/test/confs/0178
+++ b/test/confs/0178
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0179 b/test/confs/0179
index 0aee0c0..39363d4 100644
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0180 b/test/confs/0180
index 7f9d824..4f291f4 100644
--- a/test/confs/0180
+++ b/test/confs/0180
@@ -5,7 +5,6 @@ CSS=check_spool_space=100000000K
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0181 b/test/confs/0181
index d4e1227..a4e38dc 100644
--- a/test/confs/0181
+++ b/test/confs/0181
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0182 b/test/confs/0182
index 6125ed2..1f08905 100644
--- a/test/confs/0182
+++ b/test/confs/0182
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0183 b/test/confs/0183
index 73478f4..89b735a 100644
--- a/test/confs/0183
+++ b/test/confs/0183
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0184 b/test/confs/0184
index 7b8cc0d..1cc0c7b 100644
--- a/test/confs/0184
+++ b/test/confs/0184
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0185 b/test/confs/0185
index 08cb1d2..d4a5dac 100644
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0186 b/test/confs/0186
index 931319f..e22f426 100644
--- a/test/confs/0186
+++ b/test/confs/0186
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0187 b/test/confs/0187
index e93e4b4..9750ae0 100644
--- a/test/confs/0187
+++ b/test/confs/0187
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0188 b/test/confs/0188
index 60b8b30..8778e14 100644
--- a/test/confs/0188
+++ b/test/confs/0188
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0189 b/test/confs/0189
index 98bb236..fcf63ff 100644
--- a/test/confs/0189
+++ b/test/confs/0189
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0190 b/test/confs/0190
index 3b34b0c..6925a37 100644
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0191 b/test/confs/0191
index 410d2bf..0c7628c 100644
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0192 b/test/confs/0192
index d67e0bd..419bc6f 100644
--- a/test/confs/0192
+++ b/test/confs/0192
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0193 b/test/confs/0193
index 9410a4d..e819e70 100644
--- a/test/confs/0193
+++ b/test/confs/0193
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0194 b/test/confs/0194
index bfcaa50..94f810f 100644
--- a/test/confs/0194
+++ b/test/confs/0194
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0195 b/test/confs/0195
index 19efd4e..fd2e767 100644
--- a/test/confs/0195
+++ b/test/confs/0195
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0196 b/test/confs/0196
index 214f529..522cd4b 100644
--- a/test/confs/0196
+++ b/test/confs/0196
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0197 b/test/confs/0197
index 175b671..96a8e0b 100644
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -5,7 +5,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0198 b/test/confs/0198
index ab05bf1..de7b1f3 100644
--- a/test/confs/0198
+++ b/test/confs/0198
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0199 b/test/confs/0199
index 8c84ee6..2d3f204 100644
--- a/test/confs/0199
+++ b/test/confs/0199
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0200 b/test/confs/0200
index 107b634..9eccd23 100644
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0201 b/test/confs/0201
index 284e384..69bb69b 100644
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0202 b/test/confs/0202
index da3660c..77eab7f 100644
--- a/test/confs/0202
+++ b/test/confs/0202
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0203 b/test/confs/0203
index f1080e0..64dd19c 100644
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0204 b/test/confs/0204
index e7db49f..a9ff5bb 100644
--- a/test/confs/0204
+++ b/test/confs/0204
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0205 b/test/confs/0205
index 42638bc..eeff897 100644
--- a/test/confs/0205
+++ b/test/confs/0205
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0206 b/test/confs/0206
index ca3b96e..d42392e 100644
--- a/test/confs/0206
+++ b/test/confs/0206
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0207 b/test/confs/0207
index f119bce..c8981ee 100644
--- a/test/confs/0207
+++ b/test/confs/0207
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0208 b/test/confs/0208
index a80fb6d..1212564 100644
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -5,7 +5,6 @@ MESSAGE_LOGS = true
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0209 b/test/confs/0209
index b9db7a0..c8a4739 100644
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0210 b/test/confs/0210
index 486f1ae..9e709f7 100644
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0211 b/test/confs/0211
index 3894373..89e98a4 100644
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0212 b/test/confs/0212
index 3c0f49d..1d14d89 100644
--- a/test/confs/0212
+++ b/test/confs/0212
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0213 b/test/confs/0213
index 16a8a33..226ade9 100644
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0214 b/test/confs/0214
index 10e6e7b..baaa2c0 100644
--- a/test/confs/0214
+++ b/test/confs/0214
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0215 b/test/confs/0215
index 102fd0a..0109d89 100644
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -7,7 +7,6 @@ AUTHF=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0216 b/test/confs/0216
index 04195d1..3250331 100644
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0217 b/test/confs/0217
index 96d97cb..d1371dd 100644
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -5,7 +5,6 @@ HAP=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0218 b/test/confs/0218
index 4458e18..2a4bff6 100644
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0219 b/test/confs/0219
index b221a88..f3538a7 100644
--- a/test/confs/0219
+++ b/test/confs/0219
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0220 b/test/confs/0220
index ea7f2f5..095d207 100644
--- a/test/confs/0220
+++ b/test/confs/0220
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0221 b/test/confs/0221
index a05aaae..a28af6a 100644
--- a/test/confs/0221
+++ b/test/confs/0221
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0222 b/test/confs/0222
index f6f720e..412baf2 100644
--- a/test/confs/0222
+++ b/test/confs/0222
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0223 b/test/confs/0223
index af375c9..93da92c 100644
--- a/test/confs/0223
+++ b/test/confs/0223
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0224 b/test/confs/0224
index 9ce4bc4..6b87aa6 100644
--- a/test/confs/0224
+++ b/test/confs/0224
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0225 b/test/confs/0225
index f10ea4b..279b84a 100644
--- a/test/confs/0225
+++ b/test/confs/0225
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0226 b/test/confs/0226
index 8b6a67e..9ebdb79 100644
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0227 b/test/confs/0227
index 06fae3f..adc942f 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0228 b/test/confs/0228
index dbf4d12..c143f9b 100644
--- a/test/confs/0228
+++ b/test/confs/0228
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0229 b/test/confs/0229
index af78f1c..151ed13 100644
--- a/test/confs/0229
+++ b/test/confs/0229
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0230 b/test/confs/0230
index 82c0c04..df25468 100644
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0231 b/test/confs/0231
index 721b8f7..beb9da5 100644
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0232 b/test/confs/0232
index 99edc28..be4f39b 100644
--- a/test/confs/0232
+++ b/test/confs/0232
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0233 b/test/confs/0233
index 15c605c..a96661a 100644
--- a/test/confs/0233
+++ b/test/confs/0233
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0234 b/test/confs/0234
index 69c8163..b94456c 100644
--- a/test/confs/0234
+++ b/test/confs/0234
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0235 b/test/confs/0235
index 4856e72..ef6da69 100644
--- a/test/confs/0235
+++ b/test/confs/0235
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0236 b/test/confs/0236
index e2402a5..a6bd675 100644
--- a/test/confs/0236
+++ b/test/confs/0236
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0237 b/test/confs/0237
index ff0fb76..e23daa1 100644
--- a/test/confs/0237
+++ b/test/confs/0237
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0238 b/test/confs/0238
index 6ff214e..6c1e8f3 100644
--- a/test/confs/0238
+++ b/test/confs/0238
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0239 b/test/confs/0239
index 8712fb9..a68a76d 100644
--- a/test/confs/0239
+++ b/test/confs/0239
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0240 b/test/confs/0240
index 91fcc9e..acccc8f 100644
--- a/test/confs/0240
+++ b/test/confs/0240
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0241 b/test/confs/0241
index 03d55b1..f907b5f 100644
--- a/test/confs/0241
+++ b/test/confs/0241
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH/junk
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0242 b/test/confs/0242
index 0acf78f..dfaa17a 100644
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0243 b/test/confs/0243
index b703f34..f13453f 100644
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0244 b/test/confs/0244
index f9fb3b5..a144720 100644
--- a/test/confs/0244
+++ b/test/confs/0244
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0245 b/test/confs/0245
index b5a55d4..7e87be0 100644
--- a/test/confs/0245
+++ b/test/confs/0245
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0246 b/test/confs/0246
index 57d8078..2cd7c31 100644
--- a/test/confs/0246
+++ b/test/confs/0246
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0247 b/test/confs/0247
index eb11b09..395a8ca 100644
--- a/test/confs/0247
+++ b/test/confs/0247
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0248 b/test/confs/0248
index dc34e53..5828021 100644
--- a/test/confs/0248
+++ b/test/confs/0248
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0249 b/test/confs/0249
index afeb2f7..8367e24 100644
--- a/test/confs/0249
+++ b/test/confs/0249
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0250 b/test/confs/0250
index 06ea636..78d9609 100644
--- a/test/confs/0250
+++ b/test/confs/0250
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0251 b/test/confs/0251
index 69f04c0..32e184c 100644
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0252 b/test/confs/0252
index 444aa10..05e2aa6 100644
--- a/test/confs/0252
+++ b/test/confs/0252
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0253 b/test/confs/0253
index b72de8c..cc730cb 100644
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0254 b/test/confs/0254
index 8fdf9f5..799bc69 100644
--- a/test/confs/0254
+++ b/test/confs/0254
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0255 b/test/confs/0255
index 0de9863..8f90f34 100644
--- a/test/confs/0255
+++ b/test/confs/0255
@@ -5,7 +5,6 @@ OPTION=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0256 b/test/confs/0256
index d17ee8d..1ebdd2b 100644
--- a/test/confs/0256
+++ b/test/confs/0256
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0257 b/test/confs/0257
index e0bef95..445ef68 100644
--- a/test/confs/0257
+++ b/test/confs/0257
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0258 b/test/confs/0258
index a507987..3c13d6c 100644
--- a/test/confs/0258
+++ b/test/confs/0258
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0259 b/test/confs/0259
index cd5c303..fef46a1 100644
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -3,6 +3,7 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 5s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0260 b/test/confs/0260
index 40df061..c2d9a8b 100644
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0261 b/test/confs/0261
index 62f161f..0ac6903 100644
--- a/test/confs/0261
+++ b/test/confs/0261
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0262 b/test/confs/0262
index b884f80..0f84c7a 100644
--- a/test/confs/0262
+++ b/test/confs/0262
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0263 b/test/confs/0263
index bbc6992..417bfea 100644
--- a/test/confs/0263
+++ b/test/confs/0263
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0264 b/test/confs/0264
index be718bc..ffa4602 100644
--- a/test/confs/0264
+++ b/test/confs/0264
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0265 b/test/confs/0265
index 5070e20..87ffd2e 100644
--- a/test/confs/0265
+++ b/test/confs/0265
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0266 b/test/confs/0266
index 534abae..3a151f5 100644
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0267 b/test/confs/0267
index b755a33..73dc94b 100644
--- a/test/confs/0267
+++ b/test/confs/0267
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0268 b/test/confs/0268
index 6be4e66..0d22e85 100644
--- a/test/confs/0268
+++ b/test/confs/0268
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0269 b/test/confs/0269
index 5c99219..e7b6360 100644
--- a/test/confs/0269
+++ b/test/confs/0269
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0270 b/test/confs/0270
index f059588..3cd379d 100644
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0271 b/test/confs/0271
index f3fb438..4e08b8f 100644
--- a/test/confs/0271
+++ b/test/confs/0271
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0272 b/test/confs/0272
index 94955d8..f4e8604 100644
--- a/test/confs/0272
+++ b/test/confs/0272
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0273 b/test/confs/0273
index 48bd719..180e30f 100644
--- a/test/confs/0273
+++ b/test/confs/0273
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0274 b/test/confs/0274
index 72005a6..ed318d2 100644
--- a/test/confs/0274
+++ b/test/confs/0274
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0275 b/test/confs/0275
index b96c65b..e4fc444 100644
--- a/test/confs/0275
+++ b/test/confs/0275
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0276 b/test/confs/0276
index 96ce209..e3b3dc4 100644
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0277 b/test/confs/0277
index 245936a..47d5286 100644
--- a/test/confs/0277
+++ b/test/confs/0277
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0278 b/test/confs/0278
index 6333840..3b47eb7 100644
--- a/test/confs/0278
+++ b/test/confs/0278
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0279 b/test/confs/0279
index 1b83064..5bcba79 100644
--- a/test/confs/0279
+++ b/test/confs/0279
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0280 b/test/confs/0280
index 17134c3..389176e 100644
--- a/test/confs/0280
+++ b/test/confs/0280
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0281 b/test/confs/0281
index 002bb16..94527a2 100644
--- a/test/confs/0281
+++ b/test/confs/0281
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0282 b/test/confs/0282
index 9ebe5ad..90875f5 100644
--- a/test/confs/0282
+++ b/test/confs/0282
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0283 b/test/confs/0283
index 760109c..23949cb 100644
--- a/test/confs/0283
+++ b/test/confs/0283
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0284 b/test/confs/0284
index 0ec0b0f..f11e99b 100644
--- a/test/confs/0284
+++ b/test/confs/0284
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0285 b/test/confs/0285
index f583248..c06762d 100644
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0286 b/test/confs/0286
index b7746b5..c5426f4 100644
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0287 b/test/confs/0287
index a355a8b..8f9105c 100644
--- a/test/confs/0287
+++ b/test/confs/0287
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0288 b/test/confs/0288
index 938e08e..270ffb2 100644
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0289 b/test/confs/0289
index 8e52608..a3d42e8 100644
--- a/test/confs/0289
+++ b/test/confs/0289
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0290 b/test/confs/0290
index 929a907..47b2cec 100644
--- a/test/confs/0290
+++ b/test/confs/0290
@@ -13,7 +13,6 @@ C1C2 this should be a comment
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0291 b/test/confs/0291
index e750637..a3b3277 100644
--- a/test/confs/0291
+++ b/test/confs/0291
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0292 b/test/confs/0292
index 1dd0769..7089097 100644
--- a/test/confs/0292
+++ b/test/confs/0292
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0293 b/test/confs/0293
index 3a402d4..4f841bb 100644
--- a/test/confs/0293
+++ b/test/confs/0293
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0294 b/test/confs/0294
index f4b9e73..e1338b0 100644
--- a/test/confs/0294
+++ b/test/confs/0294
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0295 b/test/confs/0295
index cd85c45..a273eb2 100644
--- a/test/confs/0295
+++ b/test/confs/0295
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0296 b/test/confs/0296
index 194f404..4f820bd 100644
--- a/test/confs/0296
+++ b/test/confs/0296
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0297 b/test/confs/0297
index 8f6b6d5..0e2ca1b 100644
--- a/test/confs/0297
+++ b/test/confs/0297
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0298 b/test/confs/0298
index 13c2779..5517f8f 100644
--- a/test/confs/0298
+++ b/test/confs/0298
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0299 b/test/confs/0299
index f956a18..7487182 100644
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0300 b/test/confs/0300
index c22dd5d..4587852 100644
--- a/test/confs/0300
+++ b/test/confs/0300
@@ -6,7 +6,6 @@ PAH=127.0.0.1
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0301 b/test/confs/0301
index 3813243..8131431 100644
--- a/test/confs/0301
+++ b/test/confs/0301
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0302 b/test/confs/0302
index 1261815..f41f6b3 100644
--- a/test/confs/0302
+++ b/test/confs/0302
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0303 b/test/confs/0303
index b5ffa45..963d786 100644
--- a/test/confs/0303
+++ b/test/confs/0303
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0304 b/test/confs/0304
index d31627f..1f292a9 100644
--- a/test/confs/0304
+++ b/test/confs/0304
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0305 b/test/confs/0305
index 7283f14..c208832 100644
--- a/test/confs/0305
+++ b/test/confs/0305
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0306 b/test/confs/0306
index 85117e0..a6bf031 100644
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0307 b/test/confs/0307
index 5944b01..e64a14e 100644
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0308 b/test/confs/0308
index cab9279..0d917c7 100644
--- a/test/confs/0308
+++ b/test/confs/0308
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0309 b/test/confs/0309
index f8ed89e..13a53b3 100644
--- a/test/confs/0309
+++ b/test/confs/0309
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0310 b/test/confs/0310
index 74ba773..aec448c 100644
--- a/test/confs/0310
+++ b/test/confs/0310
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0311 b/test/confs/0311
index 34a99b6..644cc5e 100644
--- a/test/confs/0311
+++ b/test/confs/0311
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0312 b/test/confs/0312
index a956698..b0adf43 100644
--- a/test/confs/0312
+++ b/test/confs/0312
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0313 b/test/confs/0313
index e773e3b..7cb021d 100644
--- a/test/confs/0313
+++ b/test/confs/0313
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0314 b/test/confs/0314
index 78ebf21..9baef2e 100644
--- a/test/confs/0314
+++ b/test/confs/0314
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0315 b/test/confs/0315
index 69525e7..61a712e 100644
--- a/test/confs/0315
+++ b/test/confs/0315
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0316 b/test/confs/0316
index b953e6f..3d836d6 100644
--- a/test/confs/0316
+++ b/test/confs/0316
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0317 b/test/confs/0317
index 0c3d9e5..efce1f8 100644
--- a/test/confs/0317
+++ b/test/confs/0317
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0318 b/test/confs/0318
index f4872b1..a88b37e 100644
--- a/test/confs/0318
+++ b/test/confs/0318
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0319 b/test/confs/0319
index 62ad75b..549c55f 100644
--- a/test/confs/0319
+++ b/test/confs/0319
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0320 b/test/confs/0320
index d14802b..e553a96 100644
--- a/test/confs/0320
+++ b/test/confs/0320
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0321 b/test/confs/0321
index c5227a3..61dcd07 100644
--- a/test/confs/0321
+++ b/test/confs/0321
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0322 b/test/confs/0322
index a33232e..34385f7 100644
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -5,7 +5,6 @@ LS=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0323 b/test/confs/0323
index a6d18c5..049bf1c 100644
--- a/test/confs/0323
+++ b/test/confs/0323
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0324 b/test/confs/0324
index a725195..8142397 100644
--- a/test/confs/0324
+++ b/test/confs/0324
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0325 b/test/confs/0325
index 5310dcc..d6f006e 100644
--- a/test/confs/0325
+++ b/test/confs/0325
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0326 b/test/confs/0326
index 4b4f49f..a8d6c66 100644
--- a/test/confs/0326
+++ b/test/confs/0326
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0327 b/test/confs/0327
index c055df0..b6d8baa 100644
--- a/test/confs/0327
+++ b/test/confs/0327
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0328 b/test/confs/0328
index 29d732a..516012a 100644
--- a/test/confs/0328
+++ b/test/confs/0328
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0329 b/test/confs/0329
index 4caeab0..58ddc40 100644
--- a/test/confs/0329
+++ b/test/confs/0329
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0330 b/test/confs/0330
index d4ab3d4..a504325 100644
--- a/test/confs/0330
+++ b/test/confs/0330
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0331 b/test/confs/0331
index ff3bf41..96108ba 100644
--- a/test/confs/0331
+++ b/test/confs/0331
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0332 b/test/confs/0332
index f9ad188..c7785dc 100644
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0333 b/test/confs/0333
index 3e97eb8..3113131 100644
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0334 b/test/confs/0334
index 54c547d..989f667 100644
--- a/test/confs/0334
+++ b/test/confs/0334
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0335 b/test/confs/0335
index b6f6281..72d9a29 100644
--- a/test/confs/0335
+++ b/test/confs/0335
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0336 b/test/confs/0336
index fb6b05f..ae6136b 100644
--- a/test/confs/0336
+++ b/test/confs/0336
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0337 b/test/confs/0337
index 4a8f4e4..ce80752 100644
--- a/test/confs/0337
+++ b/test/confs/0337
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0338 b/test/confs/0338
index 506a5ba..4c14bc0 100644
--- a/test/confs/0338
+++ b/test/confs/0338
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0339 b/test/confs/0339
index 720481c..04b8683 100644
--- a/test/confs/0339
+++ b/test/confs/0339
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0340 b/test/confs/0340
index 2184b4d..aa3a975 100644
--- a/test/confs/0340
+++ b/test/confs/0340
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0341 b/test/confs/0341
index 1719d5d..fcb187a 100644
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0342 b/test/confs/0342
index 4c55b23..be285fd 100644
--- a/test/confs/0342
+++ b/test/confs/0342
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0343 b/test/confs/0343
index a694989..60fa962 100644
--- a/test/confs/0343
+++ b/test/confs/0343
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0344 b/test/confs/0344
index 5243750..9483069 100644
--- a/test/confs/0344
+++ b/test/confs/0344
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0345 b/test/confs/0345
index d0e855f..ad35ca5 100644
--- a/test/confs/0345
+++ b/test/confs/0345
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0346 b/test/confs/0346
index 770eba9..560c556 100644
--- a/test/confs/0346
+++ b/test/confs/0346
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0347 b/test/confs/0347
index 91da97a..a68f433 100644
--- a/test/confs/0347
+++ b/test/confs/0347
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0348 b/test/confs/0348
index ecbc007..c196b41 100644
--- a/test/confs/0348
+++ b/test/confs/0348
@@ -4,7 +4,6 @@ RETRY=G,1,20m,1.5

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0349 b/test/confs/0349
index edede23..65b1083 100644
--- a/test/confs/0349
+++ b/test/confs/0349
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0350 b/test/confs/0350
index 47e243d..c842a2a 100644
--- a/test/confs/0350
+++ b/test/confs/0350
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0351 b/test/confs/0351
index 78820f2..f673652 100644
--- a/test/confs/0351
+++ b/test/confs/0351
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0352 b/test/confs/0352
index a2ae86f..67e4837 100644
--- a/test/confs/0352
+++ b/test/confs/0352
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0353 b/test/confs/0353
index 5fdd04e..e090d48 100644
--- a/test/confs/0353
+++ b/test/confs/0353
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0354 b/test/confs/0354
index d40b4f5..523257c 100644
--- a/test/confs/0354
+++ b/test/confs/0354
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0355 b/test/confs/0355
index 9b86cca..8615e08 100644
--- a/test/confs/0355
+++ b/test/confs/0355
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0356 b/test/confs/0356
index e932119..5a93119 100644
--- a/test/confs/0356
+++ b/test/confs/0356
@@ -4,7 +4,6 @@ MESSAGE_LOGS =

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0357 b/test/confs/0357
index 560676b..a83c389 100644
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0358 b/test/confs/0358
index e66020b..4a2b7dd 100644
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0359 b/test/confs/0359
index c24f6f1..5effea5 100644
--- a/test/confs/0359
+++ b/test/confs/0359
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0360 b/test/confs/0360
index 0275cbd..a00f102 100644
--- a/test/confs/0360
+++ b/test/confs/0360
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0361 b/test/confs/0361
index ea1f391..b374e1d 100644
--- a/test/confs/0361
+++ b/test/confs/0361
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0362 b/test/confs/0362
index 1568939..2afdca6 100644
--- a/test/confs/0362
+++ b/test/confs/0362
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0363 b/test/confs/0363
index 5b7185d..9b094f8 100644
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0364 b/test/confs/0364
index 0ae70d6..1411891 100644
--- a/test/confs/0364
+++ b/test/confs/0364
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0365 b/test/confs/0365
index 54e24e6..fb7e872 100644
--- a/test/confs/0365
+++ b/test/confs/0365
@@ -5,7 +5,6 @@ SELECTOR=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0366 b/test/confs/0366
index 930b646..4ad94b1 100644
--- a/test/confs/0366
+++ b/test/confs/0366
@@ -4,7 +4,6 @@ HOSTS_MAX_TRY=5

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0367 b/test/confs/0367
index f9a8d1c..9f6a9d3 100644
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0368 b/test/confs/0368
index 9117420..5afb8e7 100644
--- a/test/confs/0368
+++ b/test/confs/0368
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0369 b/test/confs/0369
index 879b77e..40043c4 100644
--- a/test/confs/0369
+++ b/test/confs/0369
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0370 b/test/confs/0370
index f1f8a55..865dd6a 100644
--- a/test/confs/0370
+++ b/test/confs/0370
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0371 b/test/confs/0371
index a13d7cd..679a54b 100644
--- a/test/confs/0371
+++ b/test/confs/0371
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0372 b/test/confs/0372
index af03b3a..ac2b4bb 100644
--- a/test/confs/0372
+++ b/test/confs/0372
@@ -5,7 +5,6 @@ STRICT=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0373 b/test/confs/0373
index c02973a..b0407eb 100644
--- a/test/confs/0373
+++ b/test/confs/0373
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0374 b/test/confs/0374
index 3c1381b..b345a9f 100644
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0375 b/test/confs/0375
index a1322bb..1c246af 100644
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0376 b/test/confs/0376
index d86d1dd..7a0b0fc 100644
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -5,7 +5,6 @@ PEX=10s
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0377 b/test/confs/0377
index a08b494..729e80c 100644
--- a/test/confs/0377
+++ b/test/confs/0377
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0378 b/test/confs/0378
index 9eaca09..9f1ed68 100644
--- a/test/confs/0378
+++ b/test/confs/0378
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0379 b/test/confs/0379
index 81a38a2..7fca137 100644
--- a/test/confs/0379
+++ b/test/confs/0379
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0380 b/test/confs/0380
index c6bdb5a..8403ccb 100644
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0381 b/test/confs/0381
index 8d930c6..4f7304e 100644
--- a/test/confs/0381
+++ b/test/confs/0381
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0382 b/test/confs/0382
index 4fad2b6..e986a28 100644
--- a/test/confs/0382
+++ b/test/confs/0382
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0383 b/test/confs/0383
index fbb4029..1749bfa 100644
--- a/test/confs/0383
+++ b/test/confs/0383
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0384 b/test/confs/0384
index 225a243..f8dce40 100644
--- a/test/confs/0384
+++ b/test/confs/0384
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0385 b/test/confs/0385
index 85172e6..e21e3cb 100644
--- a/test/confs/0385
+++ b/test/confs/0385
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0386 b/test/confs/0386
index f88f1b0..c9715f1 100644
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0387 b/test/confs/0387
index c1100f4..5b7d591 100644
--- a/test/confs/0387
+++ b/test/confs/0387
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0388 b/test/confs/0388
index 0252cbd..3806182 100644
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0389 b/test/confs/0389
index fb9f530..b3d5f66 100644
--- a/test/confs/0389
+++ b/test/confs/0389
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0390 b/test/confs/0390
index d6e5b9c..0693229 100644
--- a/test/confs/0390
+++ b/test/confs/0390
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0391 b/test/confs/0391
index d094faa..2bea708 100644
--- a/test/confs/0391
+++ b/test/confs/0391
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0392 b/test/confs/0392
index d7b0dc7..bb6c683 100644
--- a/test/confs/0392
+++ b/test/confs/0392
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0393 b/test/confs/0393
index c7bbf00..7b1d0fb 100644
--- a/test/confs/0393
+++ b/test/confs/0393
@@ -4,7 +4,6 @@ FILTER=/bin/cat

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0394 b/test/confs/0394
index 1ccbe2e..f7dfe90 100644
--- a/test/confs/0394
+++ b/test/confs/0394
@@ -4,7 +4,6 @@ OPT=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0395 b/test/confs/0395
index 09861c2..dda9055 100644
--- a/test/confs/0395
+++ b/test/confs/0395
@@ -4,7 +4,6 @@ TRUSTED=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0396 b/test/confs/0396
index 96e16f6..5fd547f 100644
--- a/test/confs/0396
+++ b/test/confs/0396
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0397 b/test/confs/0397
index bce775a..99c86ac 100644
--- a/test/confs/0397
+++ b/test/confs/0397
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
gecos_pattern = ""
gecos_name = CALLER_NAME
diff --git a/test/confs/0398 b/test/confs/0398
index 31c5617..b894e46 100644
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0399 b/test/confs/0399
index 7d5215b..45e68e3 100644
--- a/test/confs/0399
+++ b/test/confs/0399
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0400 b/test/confs/0400
index c7daad9..d2721df 100644
--- a/test/confs/0400
+++ b/test/confs/0400
@@ -4,7 +4,6 @@ DATA=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0401 b/test/confs/0401
index d77af0c..6a267d2 100644
--- a/test/confs/0401
+++ b/test/confs/0401
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0402 b/test/confs/0402
index 2adc757..b231629 100644
--- a/test/confs/0402
+++ b/test/confs/0402
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0403 b/test/confs/0403
index d0bd93d..dc7f09c 100644
--- a/test/confs/0403
+++ b/test/confs/0403
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0404 b/test/confs/0404
index 75a5949..5fe8c9b 100644
--- a/test/confs/0404
+++ b/test/confs/0404
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0405 b/test/confs/0405
index 1bffa68..8fe2248 100644
--- a/test/confs/0405
+++ b/test/confs/0405
@@ -4,7 +4,6 @@ UTF8=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0406 b/test/confs/0406
index fa4ad51..26d4c2d 100644
--- a/test/confs/0406
+++ b/test/confs/0406
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0407 b/test/confs/0407
index 8be5532..5da660c 100644
--- a/test/confs/0407
+++ b/test/confs/0407
@@ -5,7 +5,6 @@ HEADER_LINE_MAXSIZE=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0408 b/test/confs/0408
index e914ae9..9f1af13 100644
--- a/test/confs/0408
+++ b/test/confs/0408
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0409 b/test/confs/0409
index be5b769..d84f882 100644
--- a/test/confs/0409
+++ b/test/confs/0409
@@ -4,7 +4,6 @@ BANNER=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0410 b/test/confs/0410
index b8da514..6d416fc 100644
--- a/test/confs/0410
+++ b/test/confs/0410
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0411 b/test/confs/0411
index b06489d..d60c0ae 100644
--- a/test/confs/0411
+++ b/test/confs/0411
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0412 b/test/confs/0412
index 708cf0a..da851b3 100644
--- a/test/confs/0412
+++ b/test/confs/0412
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0413 b/test/confs/0413
index 8ae83de..daadb47 100644
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0414 b/test/confs/0414
index 84ca827..8a3b109 100644
--- a/test/confs/0414
+++ b/test/confs/0414
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0415 b/test/confs/0415
index 536eaa6..13e61d9 100644
--- a/test/confs/0415
+++ b/test/confs/0415
@@ -6,7 +6,6 @@ VALUE=0

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0416 b/test/confs/0416
index 08146e2..c2780b0 100644
--- a/test/confs/0416
+++ b/test/confs/0416
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0417 b/test/confs/0417
index 4052c57..12c9f68 100644
--- a/test/confs/0417
+++ b/test/confs/0417
@@ -4,7 +4,6 @@ RETURN_ERROR_DETAILS = false

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0418 b/test/confs/0418
index 7df5969..9cf13e3 100644
--- a/test/confs/0418
+++ b/test/confs/0418
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0419 b/test/confs/0419
index 72dfc68..74e7c69 100644
--- a/test/confs/0419
+++ b/test/confs/0419
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0420 b/test/confs/0420
index 0ac496f..4db37bf 100644
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0421 b/test/confs/0421
index a5feb10..ba19881 100644
--- a/test/confs/0421
+++ b/test/confs/0421
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0422 b/test/confs/0422
index e913725..00d8000 100644
--- a/test/confs/0422
+++ b/test/confs/0422
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0423 b/test/confs/0423
index 0f5ae85..f6c9778 100644
--- a/test/confs/0423
+++ b/test/confs/0423
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0424 b/test/confs/0424
index 16b4d65..657741c 100644
--- a/test/confs/0424
+++ b/test/confs/0424
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0425 b/test/confs/0425
index 73e3fb8..ca5ef43 100644
--- a/test/confs/0425
+++ b/test/confs/0425
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0426 b/test/confs/0426
index b61fead..45ab74f 100644
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0427 b/test/confs/0427
index 156c7ac..f20028e 100644
--- a/test/confs/0427
+++ b/test/confs/0427
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0428 b/test/confs/0428
index 60b49e4..fa00a43 100644
--- a/test/confs/0428
+++ b/test/confs/0428
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0429 b/test/confs/0429
index 68e7a41..aa9a4c7 100644
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0430 b/test/confs/0430
index 847af4e..4a0f8e3 100644
--- a/test/confs/0430
+++ b/test/confs/0430
@@ -6,7 +6,6 @@ SELF=freeze
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0431 b/test/confs/0431
index 0cf9422..bdb8137 100644
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -5,7 +5,6 @@ AFFIX=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0432 b/test/confs/0432
index 1f69870..cbc7788 100644
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0433 b/test/confs/0433
index 9183cc0..905a6e5 100644
--- a/test/confs/0433
+++ b/test/confs/0433
@@ -7,7 +7,6 @@ IFACE=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0434 b/test/confs/0434
index 808caa6..19d7e11 100644
--- a/test/confs/0434
+++ b/test/confs/0434
@@ -5,7 +5,6 @@ ELI=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0435 b/test/confs/0435
index 010f7cc..a2c43ad 100644
--- a/test/confs/0435
+++ b/test/confs/0435
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0436 b/test/confs/0436
index e944668..358522b 100644
--- a/test/confs/0436
+++ b/test/confs/0436
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0437 b/test/confs/0437
index 73ad8b3..6d050c5 100644
--- a/test/confs/0437
+++ b/test/confs/0437
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
spool_directory = DIR/${lookup{spool}lsearch{DIR/aux-fixed/TESTNUM.ls}}
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0438 b/test/confs/0438
index 2b129db..9e89feb 100644
--- a/test/confs/0438
+++ b/test/confs/0438
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0439 b/test/confs/0439
index 1d79e65..8b3941c 100644
--- a/test/confs/0439
+++ b/test/confs/0439
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0440 b/test/confs/0440
index 9c3bb73..06eb6ec 100644
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0441 b/test/confs/0441
index 12931ec..45bd0f3 100644
--- a/test/confs/0441
+++ b/test/confs/0441
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0442 b/test/confs/0442
index 604abab..004e1de 100644
--- a/test/confs/0442
+++ b/test/confs/0442
@@ -5,7 +5,6 @@ BAD=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0443 b/test/confs/0443
index 39f07bf..5f85d8b 100644
--- a/test/confs/0443
+++ b/test/confs/0443
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0444 b/test/confs/0444
index d696a9c..79f2d1a 100644
--- a/test/confs/0444
+++ b/test/confs/0444
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0445 b/test/confs/0445
index 55c6579..bce937a 100644
--- a/test/confs/0445
+++ b/test/confs/0445
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0446 b/test/confs/0446
index f74289f..16969e7 100644
--- a/test/confs/0446
+++ b/test/confs/0446
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0447 b/test/confs/0447
index d3ce5f7..ecdc5cd 100644
--- a/test/confs/0447
+++ b/test/confs/0447
@@ -5,7 +5,6 @@ INSERT=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0448 b/test/confs/0448
index cf70f25..b42ea18 100644
--- a/test/confs/0448
+++ b/test/confs/0448
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0449 b/test/confs/0449
index b67d267..1228f09 100644
--- a/test/confs/0449
+++ b/test/confs/0449
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0450 b/test/confs/0450
index fa0b027..d55634a 100644
--- a/test/confs/0450
+++ b/test/confs/0450
@@ -5,7 +5,6 @@ EXTRA=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0451 b/test/confs/0451
index 8c24991..b95c74b 100644
--- a/test/confs/0451
+++ b/test/confs/0451
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0452 b/test/confs/0452
index 5924320..47efb16 100644
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0453 b/test/confs/0453
index 87aa65b..5ab9f79 100644
--- a/test/confs/0453
+++ b/test/confs/0453
@@ -5,7 +5,6 @@ LIMIT=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0454 b/test/confs/0454
index d0c1844..c91ca1d 100644
--- a/test/confs/0454
+++ b/test/confs/0454
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0455 b/test/confs/0455
index 14e4161..7b1849d 100644
--- a/test/confs/0455
+++ b/test/confs/0455
@@ -4,7 +4,6 @@ HOSTS_MAX_TRY=4

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0456 b/test/confs/0456
index 3adcce5..c6c8f7d 100644
--- a/test/confs/0456
+++ b/test/confs/0456
@@ -4,7 +4,6 @@ HOSTS_MAX_TRY=4

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0457 b/test/confs/0457
index 162ed56..4a8ea4a 100644
--- a/test/confs/0457
+++ b/test/confs/0457
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0458 b/test/confs/0458
index 65fa240..17ed2b5 100644
--- a/test/confs/0458
+++ b/test/confs/0458
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0459 b/test/confs/0459
index f04d907..86350d2 100644
--- a/test/confs/0459
+++ b/test/confs/0459
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0460 b/test/confs/0460
index 5c34831..505139b 100644
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0461 b/test/confs/0461
index 5b51101..033082e 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -8,7 +8,6 @@ RETRY2=2s
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0462 b/test/confs/0462
index 7ff47e6..87d0adc 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -5,7 +5,6 @@ SELECTOR=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0463 b/test/confs/0463
index e81afcf..8f3a311 100644
--- a/test/confs/0463
+++ b/test/confs/0463
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0464 b/test/confs/0464
index 1709839..49c9d61 100644
--- a/test/confs/0464
+++ b/test/confs/0464
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0465 b/test/confs/0465
index 32c1664..771b67a 100644
--- a/test/confs/0465
+++ b/test/confs/0465
@@ -5,7 +5,6 @@ STD=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0466 b/test/confs/0466
index 575f2ce..1f9986f 100644
--- a/test/confs/0466
+++ b/test/confs/0466
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0467 b/test/confs/0467
index 56011f4..14a69f7 100644
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -5,7 +5,6 @@ SRV=smtp
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0468 b/test/confs/0468
index 293e061..2ef647d 100644
--- a/test/confs/0468
+++ b/test/confs/0468
@@ -5,7 +5,6 @@ SRV=smtp
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0469 b/test/confs/0469
index 4590151..19a345e 100644
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -5,7 +5,6 @@ SRV=smtp
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0470 b/test/confs/0470
index 69fd848..723041f 100644
--- a/test/confs/0470
+++ b/test/confs/0470
@@ -5,7 +5,6 @@ SRV=smtp
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0471 b/test/confs/0471
index df8daa9..5fee8d5 100644
--- a/test/confs/0471
+++ b/test/confs/0471
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0472 b/test/confs/0472
index f134e1e..872feb7 100644
--- a/test/confs/0472
+++ b/test/confs/0472
@@ -5,7 +5,6 @@ FUSER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0473 b/test/confs/0473
index acbe1ff..ed48ce6 100644
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -5,7 +5,6 @@ ACL_RCPT = acl_rcpt

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0474 b/test/confs/0474
index 4596e39..05aec0f 100644
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0475 b/test/confs/0475
index ff050bd..9ca4865 100644
--- a/test/confs/0475
+++ b/test/confs/0475
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0476 b/test/confs/0476
index baa3f15..c8f76b8 100644
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0477 b/test/confs/0477
index 5296ab4..ca40ec6 100644
--- a/test/confs/0477
+++ b/test/confs/0477
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0478 b/test/confs/0478
index bcdd980..4938573 100644
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -4,7 +4,6 @@ SERVER=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0479 b/test/confs/0479
index 18c32d9..619496b 100644
--- a/test/confs/0479
+++ b/test/confs/0479
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0480 b/test/confs/0480
index c8adb1b..b3a585f 100644
--- a/test/confs/0480
+++ b/test/confs/0480
@@ -8,7 +8,6 @@ SERVER=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0481 b/test/confs/0481
index 212af51..b55af86 100644
--- a/test/confs/0481
+++ b/test/confs/0481
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0482 b/test/confs/0482
index 787c423..0a09cec 100644
--- a/test/confs/0482
+++ b/test/confs/0482
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0483 b/test/confs/0483
index 753048b..2fc6139 100644
--- a/test/confs/0483
+++ b/test/confs/0483
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0484 b/test/confs/0484
index 6410060..2248f9b 100644
--- a/test/confs/0484
+++ b/test/confs/0484
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0485 b/test/confs/0485
index 6be2c23..cec0b6a 100644
--- a/test/confs/0485
+++ b/test/confs/0485
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0486 b/test/confs/0486
index bebc361..ac1ec86 100644
--- a/test/confs/0486
+++ b/test/confs/0486
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0487 b/test/confs/0487
index dcf2262..066de1a 100644
--- a/test/confs/0487
+++ b/test/confs/0487
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0488 b/test/confs/0488
index 49261fa..24815fc 100644
--- a/test/confs/0488
+++ b/test/confs/0488
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0489 b/test/confs/0489
index 70e8dfe..fe34078 100644
--- a/test/confs/0489
+++ b/test/confs/0489
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0490 b/test/confs/0490
index 29a99ba..a46b32c 100644
--- a/test/confs/0490
+++ b/test/confs/0490
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0491 b/test/confs/0491
index 100fb9a..934379b 100644
--- a/test/confs/0491
+++ b/test/confs/0491
@@ -6,7 +6,6 @@ REWRITE=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0492 b/test/confs/0492
index c17b11d..b2c4811 100644
--- a/test/confs/0492
+++ b/test/confs/0492
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0493 b/test/confs/0493
index 1716174..e96cff5 100644
--- a/test/confs/0493
+++ b/test/confs/0493
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0494 b/test/confs/0494
index 4426c2a..ff56ff1 100644
--- a/test/confs/0494
+++ b/test/confs/0494
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0495 b/test/confs/0495
index 8706c79..6af8a6a 100644
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0496 b/test/confs/0496
index 9b03b85..de16b1b 100644
--- a/test/confs/0496
+++ b/test/confs/0496
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0497 b/test/confs/0497
index 23748ae..1238e80 100644
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0498 b/test/confs/0498
index b00c634..c859c64 100644
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0499 b/test/confs/0499
index ada9e8a..bd1cbf5 100644
--- a/test/confs/0499
+++ b/test/confs/0499
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0500 b/test/confs/0500
index b069d2e..a730535 100644
--- a/test/confs/0500
+++ b/test/confs/0500
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0501 b/test/confs/0501
index 258c5e0..8a85c83 100644
--- a/test/confs/0501
+++ b/test/confs/0501
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0502 b/test/confs/0502
index 10e2abc..aab2ada 100644
--- a/test/confs/0502
+++ b/test/confs/0502
@@ -5,7 +5,6 @@ LAST=accept message = Your message here
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0503 b/test/confs/0503
index bd3ba5b..c260e6f 100644
--- a/test/confs/0503
+++ b/test/confs/0503
@@ -5,7 +5,6 @@ MSIZE=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0504 b/test/confs/0504
index f604f5e..5030b55 100644
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0505 b/test/confs/0505
index f6136a4..4ccba33 100644
--- a/test/confs/0505
+++ b/test/confs/0505
@@ -7,7 +7,6 @@ RECIPIENT=acl_smtp_rcpt=accept
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0506 b/test/confs/0506
index fb18b9b..3ffb75d 100644
--- a/test/confs/0506
+++ b/test/confs/0506
@@ -6,7 +6,6 @@ FORBID=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0507 b/test/confs/0507
index 81338ce..90e6bde 100644
--- a/test/confs/0507
+++ b/test/confs/0507
@@ -5,7 +5,6 @@ ERROR_DETAILS=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0508 b/test/confs/0508
index 2920ad6..8cd5463 100644
--- a/test/confs/0508
+++ b/test/confs/0508
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0509 b/test/confs/0509
index 16fae0a..b6978dd 100644
--- a/test/confs/0509
+++ b/test/confs/0509
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0510 b/test/confs/0510
index ce40aa3..a519b95 100644
--- a/test/confs/0510
+++ b/test/confs/0510
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0511 b/test/confs/0511
index f76721a..10018f6 100644
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0512 b/test/confs/0512
index 1b10e21..a9d049c 100644
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -5,7 +5,6 @@ HARDLIMIT=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0513 b/test/confs/0513
index 0db220b..1143451 100644
--- a/test/confs/0513
+++ b/test/confs/0513
@@ -5,7 +5,6 @@ HARDLIMIT=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0514 b/test/confs/0514
index 29fee7e..50bbdea 100644
--- a/test/confs/0514
+++ b/test/confs/0514
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0515 b/test/confs/0515
index 4fb8f5b..eb54ff3 100644
--- a/test/confs/0515
+++ b/test/confs/0515
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0516 b/test/confs/0516
index 74445af..0c0a6ed 100644
--- a/test/confs/0516
+++ b/test/confs/0516
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0517 b/test/confs/0517
index 1b10c8e..5d1fed5 100644
--- a/test/confs/0517
+++ b/test/confs/0517
@@ -5,7 +5,6 @@ ERROR_DETAILS=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0518 b/test/confs/0518
index 2c200f0..5738eeb 100644
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0519 b/test/confs/0519
index c516fa8..510c698 100644
--- a/test/confs/0519
+++ b/test/confs/0519
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0520 b/test/confs/0520
index 65e57ca..2d8bb8f 100644
--- a/test/confs/0520
+++ b/test/confs/0520
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0521 b/test/confs/0521
index fbd8f93..15555d8 100644
--- a/test/confs/0521
+++ b/test/confs/0521
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0522 b/test/confs/0522
index 6b410b3..65fcdbf 100644
--- a/test/confs/0522
+++ b/test/confs/0522
@@ -5,7 +5,6 @@ TIMEOUTDEFER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0523 b/test/confs/0523
index cfb9ea4..77a5078 100644
--- a/test/confs/0523
+++ b/test/confs/0523
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0524 b/test/confs/0524
index 0e6550c..76f0f0a 100644
--- a/test/confs/0524
+++ b/test/confs/0524
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0525 b/test/confs/0525
index d8f24ae..bab0c66 100644
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0526 b/test/confs/0526
index 7f912b1..58f2f1a 100644
--- a/test/confs/0526
+++ b/test/confs/0526
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0527 b/test/confs/0527
index f5a7869..11c98b9 100644
--- a/test/confs/0527
+++ b/test/confs/0527
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0528 b/test/confs/0528
index 69ac854..3217640 100644
--- a/test/confs/0528
+++ b/test/confs/0528
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0529 b/test/confs/0529
index 247f745..e87c8af 100644
--- a/test/confs/0529
+++ b/test/confs/0529
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0530 b/test/confs/0530
index b7ad3ff..fa2a2fd 100644
--- a/test/confs/0530
+++ b/test/confs/0530
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0531 b/test/confs/0531
index 56f679e..192e3ed 100644
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0532 b/test/confs/0532
index 42d613b..a00bb6b 100644
--- a/test/confs/0532
+++ b/test/confs/0532
@@ -5,7 +5,6 @@ CONNECTCOND=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0533 b/test/confs/0533
index c43b628..78e3435 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0534 b/test/confs/0534
index b148987..259e005 100644
--- a/test/confs/0534
+++ b/test/confs/0534
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0535 b/test/confs/0535
index a45a374..1e8f63d 100644
--- a/test/confs/0535
+++ b/test/confs/0535
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0536 b/test/confs/0536
index 0aa7c52..9d4a8ae 100644
--- a/test/confs/0536
+++ b/test/confs/0536
@@ -5,7 +5,6 @@ FORBID_SMTP_CODE = false
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0537 b/test/confs/0537
index d273af9..8609b1e 100644
--- a/test/confs/0537
+++ b/test/confs/0537
@@ -5,7 +5,6 @@ TRUSTED=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0538 b/test/confs/0538
index 5865e31..65ec0fc 100644
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0539 b/test/confs/0539
index 02b7a26..6df8957 100644
--- a/test/confs/0539
+++ b/test/confs/0539
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0540 b/test/confs/0540
index 641335f..ce469a9 100644
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0541 b/test/confs/0541
index 0b3be92..e5885f4 100644
--- a/test/confs/0541
+++ b/test/confs/0541
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0542 b/test/confs/0542
index d226951..f9f2f10 100644
--- a/test/confs/0542
+++ b/test/confs/0542
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0543 b/test/confs/0543
index e68280b..25387f8 100644
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0544 b/test/confs/0544
index ddf95e5..23a5f36 100644
--- a/test/confs/0544
+++ b/test/confs/0544
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0545 b/test/confs/0545
index 5688818..8cbbf8b 100644
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0546 b/test/confs/0546
index 736c126..7d09866 100644
--- a/test/confs/0546
+++ b/test/confs/0546
@@ -5,7 +5,6 @@ RCPT_MSG=RCPT is OK

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0547 b/test/confs/0547
index d5f2fcc..70519e6 100644
--- a/test/confs/0547
+++ b/test/confs/0547
@@ -5,7 +5,6 @@ MAXNM = 100
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0548 b/test/confs/0548
index 6306943..4cd36d9 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -4,7 +4,6 @@ SERVER=

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0549 b/test/confs/0549
index 280d4d0..29df126 100644
--- a/test/confs/0549
+++ b/test/confs/0549
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0550 b/test/confs/0550
index e08750f..088bb15 100644
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0551 b/test/confs/0551
index cecaae4..d47bf4d 100644
--- a/test/confs/0551
+++ b/test/confs/0551
@@ -5,7 +5,6 @@ LS=+pid
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0552 b/test/confs/0552
index 3ce7751..bc8b5ae 100644
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0553 b/test/confs/0553
index bdbc8df..f734548 100644
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/0554 b/test/confs/0554
index edeb977..2edb0ff 100644
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0555 b/test/confs/0555
index 07b3a59..64e169d 100644
--- a/test/confs/0555
+++ b/test/confs/0555
@@ -5,7 +5,6 @@ FAKE=fakereject
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0556 b/test/confs/0556
index 7ed0105..2708b01 100644
--- a/test/confs/0556
+++ b/test/confs/0556
@@ -8,7 +8,6 @@ PAH=127.0.0.1
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0557 b/test/confs/0557
index 3b134db..6bfb069 100644
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -8,7 +8,6 @@ HAI=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0558 b/test/confs/0558
index 18fe649..3cdb17f 100644
--- a/test/confs/0558
+++ b/test/confs/0558
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0559 b/test/confs/0559
index c148d9e..db1d8b2 100644
--- a/test/confs/0559
+++ b/test/confs/0559
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0560 b/test/confs/0560
index d5f5384..68bf16b 100644
--- a/test/confs/0560
+++ b/test/confs/0560
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0561 b/test/confs/0561
index ecdbf95..c8ca8a7 100644
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -5,7 +5,6 @@ QOLL=true
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0562 b/test/confs/0562
index 51343f6..ed0ae2b 100644
--- a/test/confs/0562
+++ b/test/confs/0562
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0564 b/test/confs/0564
index e10445b..443d285 100644
--- a/test/confs/0564
+++ b/test/confs/0564
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0565 b/test/confs/0565
index c51fd63..979cfc7 100644
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0566 b/test/confs/0566
index 83e97fb..98df1bf 100644
--- a/test/confs/0566
+++ b/test/confs/0566
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
log_selector = +8bitmime
diff --git a/test/confs/0567 b/test/confs/0567
index d56da69..5eae157 100644
--- a/test/confs/0567
+++ b/test/confs/0567
@@ -5,7 +5,6 @@ CONNECTCOND=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0569 b/test/confs/0569
index 0987e7e..517c385 100644
--- a/test/confs/0569
+++ b/test/confs/0569
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0570 b/test/confs/0570
index 4c5e5dc..6cf0807 100644
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -5,7 +5,6 @@ OPTION =

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/0600 b/test/confs/0600
index 61a9c08..d8ff26a 100644
--- a/test/confs/0600
+++ b/test/confs/0600
@@ -3,7 +3,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/1000 b/test/confs/1000
index 90c233d..9e7b57b 100644
--- a/test/confs/1000
+++ b/test/confs/1000
@@ -5,7 +5,6 @@ HL=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/1001 b/test/confs/1001
index 5341fc8..aa53c71 100644
--- a/test/confs/1001
+++ b/test/confs/1001
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/1002 b/test/confs/1002
index 5520cea..99a5866 100644
--- a/test/confs/1002
+++ b/test/confs/1002
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/1003 b/test/confs/1003
index 00cb5c1..9597b3f 100644
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/1005 b/test/confs/1005
index dfeee38..001cd83 100644
--- a/test/confs/1005
+++ b/test/confs/1005
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/1006 b/test/confs/1006
index 21ce5a4..c45c3b3 100644
--- a/test/confs/1006
+++ b/test/confs/1006
@@ -6,7 +6,6 @@ D6=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/1007 b/test/confs/1007
index 1091eea..bd4f6e9 100644
--- a/test/confs/1007
+++ b/test/confs/1007
@@ -7,7 +7,6 @@ IFACE=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/1008 b/test/confs/1008
index c00a672..11fd0be 100644
--- a/test/confs/1008
+++ b/test/confs/1008
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/1009 b/test/confs/1009
index a29187e..1bbbdd3 100644
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/1010 b/test/confs/1010
index 4a4929b..ed19a0e 100644
--- a/test/confs/1010
+++ b/test/confs/1010
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2000 b/test/confs/2000
index bc4fff2..7a2d34b 100644
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2001 b/test/confs/2001
index 7e49aed..e2572df 100644
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2002 b/test/confs/2002
index 69fc749..b154c82 100644
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2003 b/test/confs/2003
index 12087aa..8631514 100644
--- a/test/confs/2003
+++ b/test/confs/2003
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2004 b/test/confs/2004
index 280de53..2979685 100644
--- a/test/confs/2004
+++ b/test/confs/2004
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2005 b/test/confs/2005
index 5448bf1..5b57b60 100644
--- a/test/confs/2005
+++ b/test/confs/2005
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2006 b/test/confs/2006
index 9087831..8c1a13d 100644
--- a/test/confs/2006
+++ b/test/confs/2006
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2007 b/test/confs/2007
index f3d1506..5bdf76f 100644
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2008 b/test/confs/2008
index 029c2f8..4bad74a 100644
--- a/test/confs/2008
+++ b/test/confs/2008
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2009 b/test/confs/2009
index 11f7bf8..66fadea 100644
--- a/test/confs/2009
+++ b/test/confs/2009
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2010 b/test/confs/2010
index 2415c68..8aede59 100644
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -7,7 +7,6 @@ HOSTS = 127.0.0.1 : HOSTIPV4
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2012 b/test/confs/2012
index 023a594..59265d4 100644
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2013 b/test/confs/2013
index 0be2772..331dd09 100644
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2014 b/test/confs/2014
index f657f06..562e916 100644
--- a/test/confs/2014
+++ b/test/confs/2014
@@ -5,7 +5,6 @@ CRL=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2015 b/test/confs/2015
index c062a21..734c283 100644
--- a/test/confs/2015
+++ b/test/confs/2015
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2016 b/test/confs/2016
index fd53a63..f58c9af 100644
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2017 b/test/confs/2017
index 14c7245..26b257c 100644
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2018 b/test/confs/2018
index 8c75c53..4afe33b 100644
--- a/test/confs/2018
+++ b/test/confs/2018
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2019 b/test/confs/2019
index 8e63c05..f3ddd45 100644
--- a/test/confs/2019
+++ b/test/confs/2019
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2020 b/test/confs/2020
index 6010a55..7bde464 100644
--- a/test/confs/2020
+++ b/test/confs/2020
@@ -8,7 +8,6 @@ log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool

# ----- Main settings -----
diff --git a/test/confs/2021 b/test/confs/2021
index efc7f76..a441e34 100644
--- a/test/confs/2021
+++ b/test/confs/2021
@@ -6,7 +6,6 @@ TRYCLEAR=#
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2022 b/test/confs/2022
index 94dff65..d11dd5e 100644
--- a/test/confs/2022
+++ b/test/confs/2022
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2023 b/test/confs/2023
index 30db308..2b5efb5 100644
--- a/test/confs/2023
+++ b/test/confs/2023
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2024 b/test/confs/2024
index c59e975..4388994 100644
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -6,7 +6,6 @@ TVC=/dev/null
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2025 b/test/confs/2025
index c19f65e..ccb56dc 100644
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2026 b/test/confs/2026
index d70c5a2..38900bb 100644
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
.ifdef SERVER
log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/2027 b/test/confs/2027
index 0835fb7..bd15ea9 100644
--- a/test/confs/2027
+++ b/test/confs/2027
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2028 b/test/confs/2028
index df53268..38c14f2 100644
--- a/test/confs/2028
+++ b/test/confs/2028
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2029 b/test/confs/2029
index 1d691be..b98cf73 100644
--- a/test/confs/2029
+++ b/test/confs/2029
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2030 b/test/confs/2030
index 4ad1463..e89e1c9 100644
--- a/test/confs/2030
+++ b/test/confs/2030
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2031 b/test/confs/2031
index a52b21e..5791316 100644
--- a/test/confs/2031
+++ b/test/confs/2031
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2032 b/test/confs/2032
index 5a60993..002c313 100644
--- a/test/confs/2032
+++ b/test/confs/2032
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2100 b/test/confs/2100
index c6a7e69..dc8ec61 100644
--- a/test/confs/2100
+++ b/test/confs/2100
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2101 b/test/confs/2101
index 99fad1a..a8de8c0 100644
--- a/test/confs/2101
+++ b/test/confs/2101
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2102 b/test/confs/2102
index 86fce4f..38441e9 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2103 b/test/confs/2103
index db3a440..a9bc0ea 100644
--- a/test/confs/2103
+++ b/test/confs/2103
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2104 b/test/confs/2104
index 5eb2f70..610a5b7 100644
--- a/test/confs/2104
+++ b/test/confs/2104
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2105 b/test/confs/2105
index cd3ffcc..ec364a3 100644
--- a/test/confs/2105
+++ b/test/confs/2105
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2106 b/test/confs/2106
index c0f76e9..d8c685e 100644
--- a/test/confs/2106
+++ b/test/confs/2106
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2107 b/test/confs/2107
index 7903eb9..b1e1967 100644
--- a/test/confs/2107
+++ b/test/confs/2107
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2108 b/test/confs/2108
index 184abf8..0388d0c 100644
--- a/test/confs/2108
+++ b/test/confs/2108
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2109 b/test/confs/2109
index afbb03d..3e15193 100644
--- a/test/confs/2109
+++ b/test/confs/2109
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2110 b/test/confs/2110
index 1eb7ecb..2bd3ed6 100644
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -6,7 +6,6 @@ HOSTS = 127.0.0.1 : HOSTIPV4
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2111 b/test/confs/2111
index 075e115..9abfc7a 100644
--- a/test/confs/2111
+++ b/test/confs/2111
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2112 b/test/confs/2112
index d21fee0..cbd0bab 100644
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2113 b/test/confs/2113
index d5be248..d9ac504 100644
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2114 b/test/confs/2114
index c395c73..d652c06 100644
--- a/test/confs/2114
+++ b/test/confs/2114
@@ -5,7 +5,6 @@ CRL=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2115 b/test/confs/2115
index fdf1842..8142100 100644
--- a/test/confs/2115
+++ b/test/confs/2115
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2116 b/test/confs/2116
index 14a2d1e..f5a9509 100644
--- a/test/confs/2116
+++ b/test/confs/2116
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2117 b/test/confs/2117
index ab809d0..8bf80f2 100644
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2118 b/test/confs/2118
index 362d087..7ddc161 100644
--- a/test/confs/2118
+++ b/test/confs/2118
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2119 b/test/confs/2119
index 646d506..de1cd2e 100644
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2120 b/test/confs/2120
index 4c93725..c0225e8 100644
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -8,7 +8,6 @@ log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool

# ----- Main settings -----
diff --git a/test/confs/2121 b/test/confs/2121
index dbef1b7..a80e8ef 100644
--- a/test/confs/2121
+++ b/test/confs/2121
@@ -6,7 +6,6 @@ TRYCLEAR=#
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2122 b/test/confs/2122
index aed0aef..510efda 100644
--- a/test/confs/2122
+++ b/test/confs/2122
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2123 b/test/confs/2123
index 6c4843b..507159c 100644
--- a/test/confs/2123
+++ b/test/confs/2123
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2124 b/test/confs/2124
index 132c624..930f4b6 100644
--- a/test/confs/2124
+++ b/test/confs/2124
@@ -6,7 +6,6 @@ TVC=/dev/null
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2125 b/test/confs/2125
index 767bb1c..20f8e1d 100644
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2126 b/test/confs/2126
index 704346e..3ea1d9c 100644
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2127 b/test/confs/2127
index 862ad71..786134c 100644
--- a/test/confs/2127
+++ b/test/confs/2127
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2128 b/test/confs/2128
index 296c27c..3aa44e8 100644
--- a/test/confs/2128
+++ b/test/confs/2128
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2130 b/test/confs/2130
index 9f6de76..6354b7c 100644
--- a/test/confs/2130
+++ b/test/confs/2130
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2131 b/test/confs/2131
index 53c06f1..3d83099 100644
--- a/test/confs/2131
+++ b/test/confs/2131
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2132 b/test/confs/2132
index 29822fa..2b06d6c 100644
--- a/test/confs/2132
+++ b/test/confs/2132
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2149 b/test/confs/2149
index cf67f8c..1d649e9 100644
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/2150 b/test/confs/2150
index 015947b..3b27f41 100644
--- a/test/confs/2150
+++ b/test/confs/2150
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2200 b/test/confs/2200
index dc7dbaa..3bef133 100644
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2201 b/test/confs/2201
index 861db77..ae17b7c 100644
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2202 b/test/confs/2202
index a004578..7380fb0 100644
--- a/test/confs/2202
+++ b/test/confs/2202
@@ -5,7 +5,6 @@ CONNECTCOND=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2250 b/test/confs/2250
index 7a38f0b..8edb4ae 100644
--- a/test/confs/2250
+++ b/test/confs/2250
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2300 b/test/confs/2300
index d8f6f22..dbfcc40 100644
--- a/test/confs/2300
+++ b/test/confs/2300
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2400 b/test/confs/2400
index 563adba..649688f 100644
--- a/test/confs/2400
+++ b/test/confs/2400
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2500 b/test/confs/2500
index b0aa957..73f82ed 100644
--- a/test/confs/2500
+++ b/test/confs/2500
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2501 b/test/confs/2501
index 3672b30..11fc6ac 100644
--- a/test/confs/2501
+++ b/test/confs/2501
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/2600 b/test/confs/2600
index 09eedef..1156756 100644
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3000 b/test/confs/3000
index b8273f1..42e19cb 100644
--- a/test/confs/3000
+++ b/test/confs/3000
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3100 b/test/confs/3100
index 3d0b175..4b319e0 100644
--- a/test/confs/3100
+++ b/test/confs/3100
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3200 b/test/confs/3200
index 349c7a5..e86c6f9 100644
--- a/test/confs/3200
+++ b/test/confs/3200
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3201 b/test/confs/3201
index 6fb89f3..53b274b 100644
--- a/test/confs/3201
+++ b/test/confs/3201
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3202 b/test/confs/3202
index 97bbfa4..ef4967e 100644
--- a/test/confs/3202
+++ b/test/confs/3202
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3203 b/test/confs/3203
index 1ccaf26..79ace9e 100644
--- a/test/confs/3203
+++ b/test/confs/3203
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3204 b/test/confs/3204
index c4c40d8..58ca672 100644
--- a/test/confs/3204
+++ b/test/confs/3204
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3205 b/test/confs/3205
index 8b25b36..d2f7ae5 100644
--- a/test/confs/3205
+++ b/test/confs/3205
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3206 b/test/confs/3206
index 4434db1..a0b4793 100644
--- a/test/confs/3206
+++ b/test/confs/3206
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3207 b/test/confs/3207
index e9c59ae..5229e51 100644
--- a/test/confs/3207
+++ b/test/confs/3207
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3208 b/test/confs/3208
index 90a85b3..6bba1ed 100644
--- a/test/confs/3208
+++ b/test/confs/3208
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3209 b/test/confs/3209
index 518ac39..77db041 100644
--- a/test/confs/3209
+++ b/test/confs/3209
@@ -4,7 +4,6 @@ exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
qualify_domain = test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3210 b/test/confs/3210
index 5f399d6..ba9f3aa 100644
--- a/test/confs/3210
+++ b/test/confs/3210
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3211 b/test/confs/3211
index a7486df..161e869 100644
--- a/test/confs/3211
+++ b/test/confs/3211
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3212 b/test/confs/3212
index 953f2c9..e9d0bd6 100644
--- a/test/confs/3212
+++ b/test/confs/3212
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3213 b/test/confs/3213
index 6fd8867..1237d29 100644
--- a/test/confs/3213
+++ b/test/confs/3213
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3300 b/test/confs/3300
index b0d54ad..8b17646 100644
--- a/test/confs/3300
+++ b/test/confs/3300
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3400 b/test/confs/3400
index e567565..7ec7fc3 100644
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3401 b/test/confs/3401
index 60b1a46..09b09ed 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3402 b/test/confs/3402
index cc24582..2996035 100644
--- a/test/confs/3402
+++ b/test/confs/3402
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3403 b/test/confs/3403
index 6adcf65..2f12a56 100644
--- a/test/confs/3403
+++ b/test/confs/3403
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3404 b/test/confs/3404
index dc556e9..c804d93 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3405 b/test/confs/3405
index e314151..6b97180 100644
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3406 b/test/confs/3406
index a6c262e..1151331 100644
--- a/test/confs/3406
+++ b/test/confs/3406
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3407 b/test/confs/3407
index 453e3ca..443376e 100644
--- a/test/confs/3407
+++ b/test/confs/3407
@@ -4,7 +4,6 @@ OPTION=server_condition = xxx

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3408 b/test/confs/3408
index 9b90c4b..c8b0940 100644
--- a/test/confs/3408
+++ b/test/confs/3408
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3409 b/test/confs/3409
index a9f35a4..11355fc 100644
--- a/test/confs/3409
+++ b/test/confs/3409
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3410 b/test/confs/3410
index 283a7b2..a102d40 100644
--- a/test/confs/3410
+++ b/test/confs/3410
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3411 b/test/confs/3411
index c2f00db..84a2416 100644
--- a/test/confs/3411
+++ b/test/confs/3411
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3412 b/test/confs/3412
index bd8336e..09832d8 100644
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3413 b/test/confs/3413
index 2288119..a6b76d1 100644
--- a/test/confs/3413
+++ b/test/confs/3413
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3414 b/test/confs/3414
index 9013868..3b410c1 100644
--- a/test/confs/3414
+++ b/test/confs/3414
@@ -6,7 +6,6 @@ S=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3415 b/test/confs/3415
index 835484e..12be95e 100644
--- a/test/confs/3415
+++ b/test/confs/3415
@@ -7,7 +7,6 @@ AUTH_ID_DOMAIN=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/3416 b/test/confs/3416
index c5589de..6785ded 100644
--- a/test/confs/3416
+++ b/test/confs/3416
@@ -4,7 +4,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3450 b/test/confs/3450
index 25d00ac..26a277a 100644
--- a/test/confs/3450
+++ b/test/confs/3450
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3451 b/test/confs/3451
index 4f3621b..052469d 100644
--- a/test/confs/3451
+++ b/test/confs/3451
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/3452 b/test/confs/3452
index 663be3f..6e411f5 100644
--- a/test/confs/3452
+++ b/test/confs/3452
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/3453 b/test/confs/3453
index 9771050..0a2a068 100644
--- a/test/confs/3453
+++ b/test/confs/3453
@@ -5,7 +5,6 @@ REMEMBER=false
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3454 b/test/confs/3454
index 9e059f7..727a71d 100644
--- a/test/confs/3454
+++ b/test/confs/3454
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3455 b/test/confs/3455
index ab26f43..cf7caed 100644
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -5,7 +5,6 @@ HOSTS_AVOID_TLS=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3460 b/test/confs/3460
index 496bcd8..59da15c 100644
--- a/test/confs/3460
+++ b/test/confs/3460
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3461 b/test/confs/3461
index 93ab8d8..c93abdd 100644
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/3462 b/test/confs/3462
index 3907aec..f21651e 100644
--- a/test/confs/3462
+++ b/test/confs/3462
@@ -5,7 +5,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/3463 b/test/confs/3463
index d20d1c3..1933b8a 100644
--- a/test/confs/3463
+++ b/test/confs/3463
@@ -5,7 +5,6 @@ REMEMBER=false
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3464 b/test/confs/3464
index 495d0d9..79f0df2 100644
--- a/test/confs/3464
+++ b/test/confs/3464
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3465 b/test/confs/3465
index 2f2061b..9486f50 100644
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -5,7 +5,6 @@ HOSTS_AVOID_TLS=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3500 b/test/confs/3500
index 343a0b3..8853e94 100644
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3501 b/test/confs/3501
index 3f458a1..521bb78 100644
--- a/test/confs/3501
+++ b/test/confs/3501
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/3600 b/test/confs/3600
index fca55ff..c37ccf1 100644
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/4000 b/test/confs/4000
index e1275c1..822f15f 100644
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/4100 b/test/confs/4100
index bd63629..180c6f4 100644
--- a/test/confs/4100
+++ b/test/confs/4100
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/4950 b/test/confs/4950
index ef5ce9c..373aafe 100644
--- a/test/confs/4950
+++ b/test/confs/4950
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5000 b/test/confs/5000
index 6708910..f46ba25 100644
--- a/test/confs/5000
+++ b/test/confs/5000
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5001 b/test/confs/5001
index 279bea3..9e49726 100644
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5002 b/test/confs/5002
index 78dd5bb..a21bd7a 100644
--- a/test/confs/5002
+++ b/test/confs/5002
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
primary_hostname = myhost.test.ex
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5003 b/test/confs/5003
index 66cb72b..1c0d763 100644
--- a/test/confs/5003
+++ b/test/confs/5003
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5004 b/test/confs/5004
index c88668c..eb1a874 100644
--- a/test/confs/5004
+++ b/test/confs/5004
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5005 b/test/confs/5005
index 61e22e3..d38387a 100644
--- a/test/confs/5005
+++ b/test/confs/5005
@@ -5,7 +5,6 @@ QUOTA=500
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5006 b/test/confs/5006
index c8cb539..24f0361 100644
--- a/test/confs/5006
+++ b/test/confs/5006
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5007 b/test/confs/5007
index a1ac93e..59df867 100644
--- a/test/confs/5007
+++ b/test/confs/5007
@@ -5,7 +5,6 @@ QUOTA=500
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5008 b/test/confs/5008
index 9e77ba0..a9e7a72 100644
--- a/test/confs/5008
+++ b/test/confs/5008
@@ -5,7 +5,6 @@ QUOTA_FILECOUNT=0
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5009 b/test/confs/5009
index aa87fec..8da6c6e 100644
--- a/test/confs/5009
+++ b/test/confs/5009
@@ -5,7 +5,6 @@ SUB=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5050 b/test/confs/5050
index 934cf3d..acda86a 100644
--- a/test/confs/5050
+++ b/test/confs/5050
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5100 b/test/confs/5100
index 09a3dc8..4f4df39 100644
--- a/test/confs/5100
+++ b/test/confs/5100
@@ -5,7 +5,6 @@ IGNORE_QUOTA=FALSE
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5101 b/test/confs/5101
index 20b3dbb..a3bd84f 100644
--- a/test/confs/5101
+++ b/test/confs/5101
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5102 b/test/confs/5102
index 67679fa..8d69e3b 100644
--- a/test/confs/5102
+++ b/test/confs/5102
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5103 b/test/confs/5103
index 32370a7..e195052 100644
--- a/test/confs/5103
+++ b/test/confs/5103
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5200 b/test/confs/5200
index 415d2f9..aa9997b 100644
--- a/test/confs/5200
+++ b/test/confs/5200
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5201 b/test/confs/5201
index 7de9228..58af62e 100644
--- a/test/confs/5201
+++ b/test/confs/5201
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5202 b/test/confs/5202
index 33a6f59..87bc9d0 100644
--- a/test/confs/5202
+++ b/test/confs/5202
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5203 b/test/confs/5203
index aeb5e0b..0a11110 100644
--- a/test/confs/5203
+++ b/test/confs/5203
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5204 b/test/confs/5204
index 5846f5b..5cf753a 100644
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -5,7 +5,6 @@ COMMAND_USER=EXIMUSER
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5205 b/test/confs/5205
index fbbed48..5048b1d 100644
--- a/test/confs/5205
+++ b/test/confs/5205
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5206 b/test/confs/5206
index d0a3abf..7d1c562 100644
--- a/test/confs/5206
+++ b/test/confs/5206
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5207 b/test/confs/5207
index 73e5ee4..4fb4f76 100644
--- a/test/confs/5207
+++ b/test/confs/5207
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5208 b/test/confs/5208
index 4f6a981..1cd500f 100644
--- a/test/confs/5208
+++ b/test/confs/5208
@@ -6,7 +6,6 @@ SELF=freeze
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5209 b/test/confs/5209
index fb1da45..21e2739 100644
--- a/test/confs/5209
+++ b/test/confs/5209
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5300 b/test/confs/5300
index 6865447..70de563 100644
--- a/test/confs/5300
+++ b/test/confs/5300
@@ -5,7 +5,6 @@ ALLOW=true
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5301 b/test/confs/5301
index 115604f..0c130a0 100644
--- a/test/confs/5301
+++ b/test/confs/5301
@@ -5,7 +5,6 @@ D6=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5400 b/test/confs/5400
index 6246698..09a0aaf 100644
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5401 b/test/confs/5401
index db018a6..5978b7f 100644
--- a/test/confs/5401
+++ b/test/confs/5401
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5410 b/test/confs/5410
index bea8e10..735b529 100644
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5420 b/test/confs/5420
index 2a7ebda..f8379c7 100644
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5440 b/test/confs/5440
index 95c4345..479038a 100644
--- a/test/confs/5440
+++ b/test/confs/5440
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5450 b/test/confs/5450
index 953b474..145bdc8 100644
--- a/test/confs/5450
+++ b/test/confs/5450
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5500 b/test/confs/5500
index 1bc830e..6b9e328 100644
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -6,7 +6,6 @@ LOG_SELECTOR=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5510 b/test/confs/5510
index 4872421..083394e 100644
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -6,7 +6,6 @@ LOG_SELECTOR=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5600 b/test/confs/5600
index 018ee3a..2dc1090 100644
--- a/test/confs/5600
+++ b/test/confs/5600
@@ -6,7 +6,6 @@ CRL=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5601 b/test/confs/5601
index 1a73203..785f0c6 100644
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5608 b/test/confs/5608
index 6061a13..311cc12 100644
--- a/test/confs/5608
+++ b/test/confs/5608
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5650 b/test/confs/5650
index 2b89603..bf4462b 100644
--- a/test/confs/5650
+++ b/test/confs/5650
@@ -6,7 +6,6 @@ CRL=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5651 b/test/confs/5651
index f09df57..cffa410 100644
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5658 b/test/confs/5658
index 6a75b8c..10938e1 100644
--- a/test/confs/5658
+++ b/test/confs/5658
@@ -6,7 +6,6 @@ SERVER =
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5700 b/test/confs/5700
index 2df6341..4d0abea 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/5750 b/test/confs/5750
index 98fd46f..13ee149 100644
--- a/test/confs/5750
+++ b/test/confs/5750
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5760 b/test/confs/5760
index 03d1a6b..303420f 100644
--- a/test/confs/5760
+++ b/test/confs/5760
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5820 b/test/confs/5820
index f1bd09d..1b48702 100644
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5840 b/test/confs/5840
index 5c0f6a5..cd9e8b9 100644
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/5860 b/test/confs/5860
index 7d9c755..d3f6db3 100644
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/9000 b/test/confs/9000
index 8f48594..8f55b92 100644
--- a/test/confs/9000
+++ b/test/confs/9000
@@ -5,7 +5,6 @@ LDAPSERVERS=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9001 b/test/confs/9001
index b417715..3f0b523 100644
--- a/test/confs/9001
+++ b/test/confs/9001
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9100 b/test/confs/9100
index a36b30b..0285c80 100644
--- a/test/confs/9100
+++ b/test/confs/9100
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9200 b/test/confs/9200
index 022e589..1aac8b1 100644
--- a/test/confs/9200
+++ b/test/confs/9200
@@ -5,7 +5,6 @@ SERVERS=localhost/test/ph10/
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9300 b/test/confs/9300
index 9136504..05e8841 100644
--- a/test/confs/9300
+++ b/test/confs/9300
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9350 b/test/confs/9350
index 4ba8e6d..e312ee6 100644
--- a/test/confs/9350
+++ b/test/confs/9350
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/9400 b/test/confs/9400
index 3f7dbe9..32fe5c9 100644
--- a/test/confs/9400
+++ b/test/confs/9400
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9401 b/test/confs/9401
index 34f7aad..cbd030f 100644
--- a/test/confs/9401
+++ b/test/confs/9401
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9402 b/test/confs/9402
index 6eb8db5..65f8926 100644
--- a/test/confs/9402
+++ b/test/confs/9402
@@ -5,7 +5,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/9450 b/test/confs/9450
index ea5f703..43fbde0 100644
--- a/test/confs/9450
+++ b/test/confs/9450
@@ -3,7 +3,6 @@
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9900 b/test/confs/9900
index 3bac998..eba2f90 100644
--- a/test/confs/9900
+++ b/test/confs/9900
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9901 b/test/confs/9901
index 86f7003..a49153b 100644
--- a/test/confs/9901
+++ b/test/confs/9901
@@ -6,7 +6,6 @@ SERVER=
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/SERVER%slog
gecos_pattern = ""
diff --git a/test/confs/9902 b/test/confs/9902
index 730d633..b252c4c 100644
--- a/test/confs/9902
+++ b/test/confs/9902
@@ -6,7 +6,6 @@ ORDER=

exim_path = EXIM_PATH
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/confs/9903 b/test/confs/9903
index c126b89..39db987 100644
--- a/test/confs/9903
+++ b/test/confs/9903
@@ -2,7 +2,6 @@

exim_path = EXIM_PATH
host_lookup_order = bydns
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
diff --git a/test/paniclog/0013 b/test/paniclog/0013
index 78e7e57..c9eb641 100644
--- a/test/paniclog/0013
+++ b/test/paniclog/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 14 of TESTSUITE/test-config:
extra characters follow string value for relay_hosts
diff --git a/test/paniclog/0148 b/test/paniclog/0148
index bf2bfc0..a2e75ff 100644
--- a/test/paniclog/0148
+++ b/test/paniclog/0148
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 17 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
missing quote at end of string value for hold_domains
diff --git a/test/paniclog/0236 b/test/paniclog/0236
index 66533fe..003f311 100644
--- a/test/paniclog/0236
+++ b/test/paniclog/0236
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 14 of TESTSUITE/test-config:
macro name too long (maximum is 63 characters)
diff --git a/test/paniclog/0290 b/test/paniclog/0290
index 24b6854..b519863 100644
--- a/test/paniclog/0290
+++ b/test/paniclog/0290
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 27 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
.include specifies a non-absolute path "non/absolute"
diff --git a/test/paniclog/0348 b/test/paniclog/0348
index d2c59c2..f901fd4 100644
--- a/test/paniclog/0348
+++ b/test/paniclog/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
diff --git a/test/paniclog/0415 b/test/paniclog/0415
index bedff5d..7ead00c 100644
--- a/test/paniclog/0415
+++ b/test/paniclog/0415
@@ -1,20 +1,20 @@
-1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 19 of TESTSUITE/test-config:
absolute value of integer "4000000M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 19 of TESTSUITE/test-config:
extra characters follow integer value for check_spool_space
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
integer "4000000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
integer "4000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
absolute value of integer "999999999999999999" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
absolute value of integer "999999999K" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
absolute value of integer "999999M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
extra characters follow integer value for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
integer expected for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
extra characters follow integer value for finduser_retries
diff --git a/test/paniclog/0442 b/test/paniclog/0442
index 6db126e..2dd90dd 100644
--- a/test/paniclog/0442
+++ b/test/paniclog/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 42 of TESTSUITE/test-config:
failed to open included configuration file /non/existent
diff --git a/test/stderr/0013 b/test/stderr/0013
index 78e7e57..c9eb641 100644
--- a/test/stderr/0013
+++ b/test/stderr/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 14 of TESTSUITE/test-config:
extra characters follow string value for relay_hosts
diff --git a/test/stderr/0148 b/test/stderr/0148
index 1b5b73a..d9ba230 100644
--- a/test/stderr/0148
+++ b/test/stderr/0148
@@ -1,3 +1,3 @@
LOG: PANIC DIE
- Exim configuration error in line 17 of TESTSUITE/test-config:
+ Exim configuration error in line 16 of TESTSUITE/test-config:
missing quote at end of string value for hold_domains
diff --git a/test/stderr/0236 b/test/stderr/0236
index 193370c..f8a4205 100644
--- a/test/stderr/0236
+++ b/test/stderr/0236
@@ -1,3 +1,3 @@
LOG: PANIC DIE
- Exim configuration error in line 15 of TESTSUITE/test-config:
+ Exim configuration error in line 14 of TESTSUITE/test-config:
macro name too long (maximum is 63 characters)
diff --git a/test/stderr/0290 b/test/stderr/0290
index cd1712e..4aed074 100644
--- a/test/stderr/0290
+++ b/test/stderr/0290
@@ -1,3 +1,3 @@
LOG: PANIC DIE
- Exim configuration error in line 27 of TESTSUITE/test-config:
+ Exim configuration error in line 26 of TESTSUITE/test-config:
.include specifies a non-absolute path "non/absolute"
diff --git a/test/stderr/0348 b/test/stderr/0348
index d2c59c2..f901fd4 100644
--- a/test/stderr/0348
+++ b/test/stderr/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
bad parameters for retry rule
diff --git a/test/stderr/0415 b/test/stderr/0415
index 062b67b..b593b1b 100644
--- a/test/stderr/0415
+++ b/test/stderr/0415
@@ -1,30 +1,30 @@
LOG: PANIC DIE
- Exim configuration error in line 20 of TESTSUITE/test-config:
+ Exim configuration error in line 19 of TESTSUITE/test-config:
absolute value of integer "4000000M" is too large (overflow)
LOG: PANIC DIE
- Exim configuration error in line 20 of TESTSUITE/test-config:
+ Exim configuration error in line 19 of TESTSUITE/test-config:
extra characters follow integer value for check_spool_space
LOG: PANIC DIE
- Exim configuration error in line 21 of TESTSUITE/test-config:
+ Exim configuration error in line 20 of TESTSUITE/test-config:
integer "4000000000.123" is too large (overflow)
LOG: PANIC DIE
- Exim configuration error in line 21 of TESTSUITE/test-config:
+ Exim configuration error in line 20 of TESTSUITE/test-config:
integer "4000000.123" is too large (overflow)
LOG: PANIC DIE
- Exim configuration error in line 23 of TESTSUITE/test-config:
+ Exim configuration error in line 22 of TESTSUITE/test-config:
absolute value of integer "999999999999999999" is too large (overflow)
LOG: PANIC DIE
- Exim configuration error in line 23 of TESTSUITE/test-config:
+ Exim configuration error in line 22 of TESTSUITE/test-config:
absolute value of integer "999999999K" is too large (overflow)
LOG: PANIC DIE
- Exim configuration error in line 23 of TESTSUITE/test-config:
+ Exim configuration error in line 22 of TESTSUITE/test-config:
absolute value of integer "999999M" is too large (overflow)
LOG: PANIC DIE
- Exim configuration error in line 23 of TESTSUITE/test-config:
+ Exim configuration error in line 22 of TESTSUITE/test-config:
extra characters follow integer value for finduser_retries
LOG: PANIC DIE
- Exim configuration error in line 23 of TESTSUITE/test-config:
+ Exim configuration error in line 22 of TESTSUITE/test-config:
integer expected for finduser_retries
LOG: PANIC DIE
- Exim configuration error in line 23 of TESTSUITE/test-config:
+ Exim configuration error in line 22 of TESTSUITE/test-config:
extra characters follow integer value for finduser_retries
diff --git a/test/stderr/0442 b/test/stderr/0442
index 6db126e..2dd90dd 100644
--- a/test/stderr/0442
+++ b/test/stderr/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 42 of TESTSUITE/test-config:
failed to open included configuration file /non/existent