summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2014-12-23 19:50:07 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-01-12 18:58:35 +0000
commitf926e27276301de1e2fd011b7edcd1b85d8c4754 (patch)
tree37c4d07122f675a8be3a6970b10a05ce39622d3e
parent712240406dff5ac02645003ce1ea40b70a3080ac (diff)
Disable identd (rfc1413) lookups by default
-rw-r--r--doc/doc-docbook/spec.xfpt10
-rw-r--r--doc/doc-txt/ChangeLog3
-rw-r--r--src/src/configure.default25
-rw-r--r--src/src/globals.c4
-rw-r--r--test/confs/00011
-rw-r--r--test/confs/00021
-rw-r--r--test/confs/00031
-rw-r--r--test/confs/00041
-rw-r--r--test/confs/00051
-rw-r--r--test/confs/00061
-rw-r--r--test/confs/00071
-rw-r--r--test/confs/00081
-rw-r--r--test/confs/00091
-rw-r--r--test/confs/00101
-rw-r--r--test/confs/00111
-rw-r--r--test/confs/00121
-rw-r--r--test/confs/00131
-rw-r--r--test/confs/00141
-rw-r--r--test/confs/00151
-rw-r--r--test/confs/00161
-rw-r--r--test/confs/00171
-rw-r--r--test/confs/00181
-rw-r--r--test/confs/00191
-rw-r--r--test/confs/00201
-rw-r--r--test/confs/00211
-rw-r--r--test/confs/00221
-rw-r--r--test/confs/00231
-rw-r--r--test/confs/00241
-rw-r--r--test/confs/00251
-rw-r--r--test/confs/00261
-rw-r--r--test/confs/00271
-rw-r--r--test/confs/00281
-rw-r--r--test/confs/00291
-rw-r--r--test/confs/00301
-rw-r--r--test/confs/00311
-rw-r--r--test/confs/00321
-rw-r--r--test/confs/00331
-rw-r--r--test/confs/00341
-rw-r--r--test/confs/00351
-rw-r--r--test/confs/00361
-rw-r--r--test/confs/00371
-rw-r--r--test/confs/00381
-rw-r--r--test/confs/00391
-rw-r--r--test/confs/00401
-rw-r--r--test/confs/00411
-rw-r--r--test/confs/00421
-rw-r--r--test/confs/00431
-rw-r--r--test/confs/00441
-rw-r--r--test/confs/00451
-rw-r--r--test/confs/00461
-rw-r--r--test/confs/00471
-rw-r--r--test/confs/00481
-rw-r--r--test/confs/00491
-rw-r--r--test/confs/00501
-rw-r--r--test/confs/00511
-rw-r--r--test/confs/00521
-rw-r--r--test/confs/00531
-rw-r--r--test/confs/00541
-rw-r--r--test/confs/00551
-rw-r--r--test/confs/00561
-rw-r--r--test/confs/00571
-rw-r--r--test/confs/00581
-rw-r--r--test/confs/00591
-rw-r--r--test/confs/00601
-rw-r--r--test/confs/00611
-rw-r--r--test/confs/00621
-rw-r--r--test/confs/00631
-rw-r--r--test/confs/00641
-rw-r--r--test/confs/00651
-rw-r--r--test/confs/00661
-rw-r--r--test/confs/00671
-rw-r--r--test/confs/00681
-rw-r--r--test/confs/00691
-rw-r--r--test/confs/00701
-rw-r--r--test/confs/00711
-rw-r--r--test/confs/00721
-rw-r--r--test/confs/00731
-rw-r--r--test/confs/00741
-rw-r--r--test/confs/00751
-rw-r--r--test/confs/00761
-rw-r--r--test/confs/00771
-rw-r--r--test/confs/00781
-rw-r--r--test/confs/00791
-rw-r--r--test/confs/00801
-rw-r--r--test/confs/00811
-rw-r--r--test/confs/00821
-rw-r--r--test/confs/00831
-rw-r--r--test/confs/00841
-rw-r--r--test/confs/00851
-rw-r--r--test/confs/00861
-rw-r--r--test/confs/00871
-rw-r--r--test/confs/00881
-rw-r--r--test/confs/00891
-rw-r--r--test/confs/00901
-rw-r--r--test/confs/00911
-rw-r--r--test/confs/00921
-rw-r--r--test/confs/00931
-rw-r--r--test/confs/00941
-rw-r--r--test/confs/00951
-rw-r--r--test/confs/00961
-rw-r--r--test/confs/00971
-rw-r--r--test/confs/00981
-rw-r--r--test/confs/00991
-rw-r--r--test/confs/01001
-rw-r--r--test/confs/01011
-rw-r--r--test/confs/01021
-rw-r--r--test/confs/01031
-rw-r--r--test/confs/01041
-rw-r--r--test/confs/01051
-rw-r--r--test/confs/01061
-rw-r--r--test/confs/01071
-rw-r--r--test/confs/01081
-rw-r--r--test/confs/01091
-rw-r--r--test/confs/01101
-rw-r--r--test/confs/01111
-rw-r--r--test/confs/01121
-rw-r--r--test/confs/01131
-rw-r--r--test/confs/01141
-rw-r--r--test/confs/01151
-rw-r--r--test/confs/01161
-rw-r--r--test/confs/01171
-rw-r--r--test/confs/01181
-rw-r--r--test/confs/01191
-rw-r--r--test/confs/01201
-rw-r--r--test/confs/01211
-rw-r--r--test/confs/01221
-rw-r--r--test/confs/01231
-rw-r--r--test/confs/01241
-rw-r--r--test/confs/01251
-rw-r--r--test/confs/01261
-rw-r--r--test/confs/01271
-rw-r--r--test/confs/01281
-rw-r--r--test/confs/01291
-rw-r--r--test/confs/01301
-rw-r--r--test/confs/01311
-rw-r--r--test/confs/01321
-rw-r--r--test/confs/01331
-rw-r--r--test/confs/01341
-rw-r--r--test/confs/01351
-rw-r--r--test/confs/01361
-rw-r--r--test/confs/01371
-rw-r--r--test/confs/01381
-rw-r--r--test/confs/01391
-rw-r--r--test/confs/01401
-rw-r--r--test/confs/01411
-rw-r--r--test/confs/01421
-rw-r--r--test/confs/01431
-rw-r--r--test/confs/01441
-rw-r--r--test/confs/01451
-rw-r--r--test/confs/01461
-rw-r--r--test/confs/01471
-rw-r--r--test/confs/01481
-rw-r--r--test/confs/01491
-rw-r--r--test/confs/01501
-rw-r--r--test/confs/01511
-rw-r--r--test/confs/01521
-rw-r--r--test/confs/01531
-rw-r--r--test/confs/01541
-rw-r--r--test/confs/01551
-rw-r--r--test/confs/01561
-rw-r--r--test/confs/01571
-rw-r--r--test/confs/01581
-rw-r--r--test/confs/01591
-rw-r--r--test/confs/01601
-rw-r--r--test/confs/01611
-rw-r--r--test/confs/01621
-rw-r--r--test/confs/01631
-rw-r--r--test/confs/01641
-rw-r--r--test/confs/01651
-rw-r--r--test/confs/01661
-rw-r--r--test/confs/01671
-rw-r--r--test/confs/01681
-rw-r--r--test/confs/01691
-rw-r--r--test/confs/01701
-rw-r--r--test/confs/01711
-rw-r--r--test/confs/01721
-rw-r--r--test/confs/01731
-rw-r--r--test/confs/01741
-rw-r--r--test/confs/01751
-rw-r--r--test/confs/01761
-rw-r--r--test/confs/01771
-rw-r--r--test/confs/01781
-rw-r--r--test/confs/01791
-rw-r--r--test/confs/01801
-rw-r--r--test/confs/01811
-rw-r--r--test/confs/01821
-rw-r--r--test/confs/01831
-rw-r--r--test/confs/01841
-rw-r--r--test/confs/01851
-rw-r--r--test/confs/01861
-rw-r--r--test/confs/01871
-rw-r--r--test/confs/01881
-rw-r--r--test/confs/01891
-rw-r--r--test/confs/01901
-rw-r--r--test/confs/01911
-rw-r--r--test/confs/01921
-rw-r--r--test/confs/01931
-rw-r--r--test/confs/01941
-rw-r--r--test/confs/01951
-rw-r--r--test/confs/01961
-rw-r--r--test/confs/01971
-rw-r--r--test/confs/01981
-rw-r--r--test/confs/01991
-rw-r--r--test/confs/02001
-rw-r--r--test/confs/02011
-rw-r--r--test/confs/02021
-rw-r--r--test/confs/02031
-rw-r--r--test/confs/02041
-rw-r--r--test/confs/02051
-rw-r--r--test/confs/02061
-rw-r--r--test/confs/02071
-rw-r--r--test/confs/02081
-rw-r--r--test/confs/02091
-rw-r--r--test/confs/02101
-rw-r--r--test/confs/02111
-rw-r--r--test/confs/02121
-rw-r--r--test/confs/02131
-rw-r--r--test/confs/02141
-rw-r--r--test/confs/02151
-rw-r--r--test/confs/02161
-rw-r--r--test/confs/02171
-rw-r--r--test/confs/02181
-rw-r--r--test/confs/02191
-rw-r--r--test/confs/02201
-rw-r--r--test/confs/02211
-rw-r--r--test/confs/02221
-rw-r--r--test/confs/02231
-rw-r--r--test/confs/02241
-rw-r--r--test/confs/02251
-rw-r--r--test/confs/02261
-rw-r--r--test/confs/02271
-rw-r--r--test/confs/02281
-rw-r--r--test/confs/02291
-rw-r--r--test/confs/02301
-rw-r--r--test/confs/02311
-rw-r--r--test/confs/02321
-rw-r--r--test/confs/02331
-rw-r--r--test/confs/02341
-rw-r--r--test/confs/02351
-rw-r--r--test/confs/02361
-rw-r--r--test/confs/02371
-rw-r--r--test/confs/02381
-rw-r--r--test/confs/02391
-rw-r--r--test/confs/02401
-rw-r--r--test/confs/02411
-rw-r--r--test/confs/02421
-rw-r--r--test/confs/02431
-rw-r--r--test/confs/02441
-rw-r--r--test/confs/02451
-rw-r--r--test/confs/02461
-rw-r--r--test/confs/02471
-rw-r--r--test/confs/02481
-rw-r--r--test/confs/02491
-rw-r--r--test/confs/02501
-rw-r--r--test/confs/02511
-rw-r--r--test/confs/02521
-rw-r--r--test/confs/02531
-rw-r--r--test/confs/02541
-rw-r--r--test/confs/02551
-rw-r--r--test/confs/02561
-rw-r--r--test/confs/02571
-rw-r--r--test/confs/02581
-rw-r--r--test/confs/02591
-rw-r--r--test/confs/02601
-rw-r--r--test/confs/02611
-rw-r--r--test/confs/02621
-rw-r--r--test/confs/02631
-rw-r--r--test/confs/02641
-rw-r--r--test/confs/02651
-rw-r--r--test/confs/02661
-rw-r--r--test/confs/02671
-rw-r--r--test/confs/02681
-rw-r--r--test/confs/02691
-rw-r--r--test/confs/02701
-rw-r--r--test/confs/02711
-rw-r--r--test/confs/02721
-rw-r--r--test/confs/02731
-rw-r--r--test/confs/02741
-rw-r--r--test/confs/02751
-rw-r--r--test/confs/02761
-rw-r--r--test/confs/02771
-rw-r--r--test/confs/02781
-rw-r--r--test/confs/02791
-rw-r--r--test/confs/02801
-rw-r--r--test/confs/02811
-rw-r--r--test/confs/02821
-rw-r--r--test/confs/02831
-rw-r--r--test/confs/02841
-rw-r--r--test/confs/02851
-rw-r--r--test/confs/02861
-rw-r--r--test/confs/02871
-rw-r--r--test/confs/02881
-rw-r--r--test/confs/02891
-rw-r--r--test/confs/02901
-rw-r--r--test/confs/02911
-rw-r--r--test/confs/02921
-rw-r--r--test/confs/02931
-rw-r--r--test/confs/02941
-rw-r--r--test/confs/02951
-rw-r--r--test/confs/02961
-rw-r--r--test/confs/02971
-rw-r--r--test/confs/02981
-rw-r--r--test/confs/02991
-rw-r--r--test/confs/03001
-rw-r--r--test/confs/03011
-rw-r--r--test/confs/03021
-rw-r--r--test/confs/03031
-rw-r--r--test/confs/03041
-rw-r--r--test/confs/03051
-rw-r--r--test/confs/03061
-rw-r--r--test/confs/03071
-rw-r--r--test/confs/03081
-rw-r--r--test/confs/03091
-rw-r--r--test/confs/03101
-rw-r--r--test/confs/03111
-rw-r--r--test/confs/03121
-rw-r--r--test/confs/03131
-rw-r--r--test/confs/03141
-rw-r--r--test/confs/03151
-rw-r--r--test/confs/03161
-rw-r--r--test/confs/03171
-rw-r--r--test/confs/03181
-rw-r--r--test/confs/03191
-rw-r--r--test/confs/03201
-rw-r--r--test/confs/03211
-rw-r--r--test/confs/03221
-rw-r--r--test/confs/03231
-rw-r--r--test/confs/03241
-rw-r--r--test/confs/03251
-rw-r--r--test/confs/03261
-rw-r--r--test/confs/03271
-rw-r--r--test/confs/03281
-rw-r--r--test/confs/03291
-rw-r--r--test/confs/03301
-rw-r--r--test/confs/03311
-rw-r--r--test/confs/03321
-rw-r--r--test/confs/03331
-rw-r--r--test/confs/03341
-rw-r--r--test/confs/03351
-rw-r--r--test/confs/03361
-rw-r--r--test/confs/03371
-rw-r--r--test/confs/03381
-rw-r--r--test/confs/03391
-rw-r--r--test/confs/03401
-rw-r--r--test/confs/03411
-rw-r--r--test/confs/03421
-rw-r--r--test/confs/03431
-rw-r--r--test/confs/03441
-rw-r--r--test/confs/03451
-rw-r--r--test/confs/03461
-rw-r--r--test/confs/03471
-rw-r--r--test/confs/03481
-rw-r--r--test/confs/03491
-rw-r--r--test/confs/03501
-rw-r--r--test/confs/03511
-rw-r--r--test/confs/03521
-rw-r--r--test/confs/03531
-rw-r--r--test/confs/03541
-rw-r--r--test/confs/03551
-rw-r--r--test/confs/03561
-rw-r--r--test/confs/03571
-rw-r--r--test/confs/03581
-rw-r--r--test/confs/03591
-rw-r--r--test/confs/03601
-rw-r--r--test/confs/03611
-rw-r--r--test/confs/03621
-rw-r--r--test/confs/03631
-rw-r--r--test/confs/03641
-rw-r--r--test/confs/03651
-rw-r--r--test/confs/03661
-rw-r--r--test/confs/03671
-rw-r--r--test/confs/03681
-rw-r--r--test/confs/03691
-rw-r--r--test/confs/03701
-rw-r--r--test/confs/03711
-rw-r--r--test/confs/03721
-rw-r--r--test/confs/03731
-rw-r--r--test/confs/03741
-rw-r--r--test/confs/03751
-rw-r--r--test/confs/03761
-rw-r--r--test/confs/03771
-rw-r--r--test/confs/03781
-rw-r--r--test/confs/03791
-rw-r--r--test/confs/03801
-rw-r--r--test/confs/03811
-rw-r--r--test/confs/03821
-rw-r--r--test/confs/03831
-rw-r--r--test/confs/03841
-rw-r--r--test/confs/03851
-rw-r--r--test/confs/03861
-rw-r--r--test/confs/03871
-rw-r--r--test/confs/03881
-rw-r--r--test/confs/03891
-rw-r--r--test/confs/03901
-rw-r--r--test/confs/03911
-rw-r--r--test/confs/03921
-rw-r--r--test/confs/03931
-rw-r--r--test/confs/03941
-rw-r--r--test/confs/03951
-rw-r--r--test/confs/03961
-rw-r--r--test/confs/03971
-rw-r--r--test/confs/03981
-rw-r--r--test/confs/03991
-rw-r--r--test/confs/04001
-rw-r--r--test/confs/04011
-rw-r--r--test/confs/04021
-rw-r--r--test/confs/04031
-rw-r--r--test/confs/04041
-rw-r--r--test/confs/04051
-rw-r--r--test/confs/04061
-rw-r--r--test/confs/04071
-rw-r--r--test/confs/04081
-rw-r--r--test/confs/04091
-rw-r--r--test/confs/04101
-rw-r--r--test/confs/04111
-rw-r--r--test/confs/04121
-rw-r--r--test/confs/04131
-rw-r--r--test/confs/04141
-rw-r--r--test/confs/04151
-rw-r--r--test/confs/04161
-rw-r--r--test/confs/04171
-rw-r--r--test/confs/04181
-rw-r--r--test/confs/04191
-rw-r--r--test/confs/04201
-rw-r--r--test/confs/04211
-rw-r--r--test/confs/04221
-rw-r--r--test/confs/04231
-rw-r--r--test/confs/04241
-rw-r--r--test/confs/04251
-rw-r--r--test/confs/04261
-rw-r--r--test/confs/04271
-rw-r--r--test/confs/04281
-rw-r--r--test/confs/04291
-rw-r--r--test/confs/04301
-rw-r--r--test/confs/04311
-rw-r--r--test/confs/04321
-rw-r--r--test/confs/04331
-rw-r--r--test/confs/04341
-rw-r--r--test/confs/04351
-rw-r--r--test/confs/04361
-rw-r--r--test/confs/04371
-rw-r--r--test/confs/04381
-rw-r--r--test/confs/04391
-rw-r--r--test/confs/04401
-rw-r--r--test/confs/04411
-rw-r--r--test/confs/04421
-rw-r--r--test/confs/04431
-rw-r--r--test/confs/04441
-rw-r--r--test/confs/04451
-rw-r--r--test/confs/04461
-rw-r--r--test/confs/04471
-rw-r--r--test/confs/04481
-rw-r--r--test/confs/04491
-rw-r--r--test/confs/04501
-rw-r--r--test/confs/04511
-rw-r--r--test/confs/04521
-rw-r--r--test/confs/04531
-rw-r--r--test/confs/04541
-rw-r--r--test/confs/04551
-rw-r--r--test/confs/04561
-rw-r--r--test/confs/04571
-rw-r--r--test/confs/04581
-rw-r--r--test/confs/04591
-rw-r--r--test/confs/04601
-rw-r--r--test/confs/04611
-rw-r--r--test/confs/04621
-rw-r--r--test/confs/04631
-rw-r--r--test/confs/04641
-rw-r--r--test/confs/04651
-rw-r--r--test/confs/04661
-rw-r--r--test/confs/04671
-rw-r--r--test/confs/04681
-rw-r--r--test/confs/04691
-rw-r--r--test/confs/04701
-rw-r--r--test/confs/04711
-rw-r--r--test/confs/04721
-rw-r--r--test/confs/04731
-rw-r--r--test/confs/04741
-rw-r--r--test/confs/04751
-rw-r--r--test/confs/04761
-rw-r--r--test/confs/04771
-rw-r--r--test/confs/04781
-rw-r--r--test/confs/04791
-rw-r--r--test/confs/04801
-rw-r--r--test/confs/04811
-rw-r--r--test/confs/04821
-rw-r--r--test/confs/04831
-rw-r--r--test/confs/04841
-rw-r--r--test/confs/04851
-rw-r--r--test/confs/04861
-rw-r--r--test/confs/04871
-rw-r--r--test/confs/04881
-rw-r--r--test/confs/04891
-rw-r--r--test/confs/04901
-rw-r--r--test/confs/04911
-rw-r--r--test/confs/04921
-rw-r--r--test/confs/04931
-rw-r--r--test/confs/04941
-rw-r--r--test/confs/04951
-rw-r--r--test/confs/04961
-rw-r--r--test/confs/04971
-rw-r--r--test/confs/04981
-rw-r--r--test/confs/04991
-rw-r--r--test/confs/05001
-rw-r--r--test/confs/05011
-rw-r--r--test/confs/05021
-rw-r--r--test/confs/05031
-rw-r--r--test/confs/05041
-rw-r--r--test/confs/05051
-rw-r--r--test/confs/05061
-rw-r--r--test/confs/05071
-rw-r--r--test/confs/05081
-rw-r--r--test/confs/05091
-rw-r--r--test/confs/05101
-rw-r--r--test/confs/05111
-rw-r--r--test/confs/05121
-rw-r--r--test/confs/05131
-rw-r--r--test/confs/05141
-rw-r--r--test/confs/05151
-rw-r--r--test/confs/05161
-rw-r--r--test/confs/05171
-rw-r--r--test/confs/05181
-rw-r--r--test/confs/05191
-rw-r--r--test/confs/05201
-rw-r--r--test/confs/05211
-rw-r--r--test/confs/05221
-rw-r--r--test/confs/05231
-rw-r--r--test/confs/05241
-rw-r--r--test/confs/05251
-rw-r--r--test/confs/05261
-rw-r--r--test/confs/05271
-rw-r--r--test/confs/05281
-rw-r--r--test/confs/05291
-rw-r--r--test/confs/05301
-rw-r--r--test/confs/05311
-rw-r--r--test/confs/05321
-rw-r--r--test/confs/05331
-rw-r--r--test/confs/05341
-rw-r--r--test/confs/05351
-rw-r--r--test/confs/05361
-rw-r--r--test/confs/05371
-rw-r--r--test/confs/05381
-rw-r--r--test/confs/05391
-rw-r--r--test/confs/05401
-rw-r--r--test/confs/05411
-rw-r--r--test/confs/05421
-rw-r--r--test/confs/05431
-rw-r--r--test/confs/05441
-rw-r--r--test/confs/05451
-rw-r--r--test/confs/05461
-rw-r--r--test/confs/05471
-rw-r--r--test/confs/05481
-rw-r--r--test/confs/05491
-rw-r--r--test/confs/05501
-rw-r--r--test/confs/05511
-rw-r--r--test/confs/05521
-rw-r--r--test/confs/05531
-rw-r--r--test/confs/05541
-rw-r--r--test/confs/05551
-rw-r--r--test/confs/05561
-rw-r--r--test/confs/05571
-rw-r--r--test/confs/05581
-rw-r--r--test/confs/05591
-rw-r--r--test/confs/05601
-rw-r--r--test/confs/05611
-rw-r--r--test/confs/05621
-rw-r--r--test/confs/05641
-rw-r--r--test/confs/05651
-rw-r--r--test/confs/05661
-rw-r--r--test/confs/05671
-rw-r--r--test/confs/05691
-rw-r--r--test/confs/05701
-rw-r--r--test/confs/06001
-rw-r--r--test/confs/10001
-rw-r--r--test/confs/10011
-rw-r--r--test/confs/10021
-rw-r--r--test/confs/10031
-rw-r--r--test/confs/10051
-rw-r--r--test/confs/10061
-rw-r--r--test/confs/10071
-rw-r--r--test/confs/10081
-rw-r--r--test/confs/10091
-rw-r--r--test/confs/10101
-rw-r--r--test/confs/20001
-rw-r--r--test/confs/20011
-rw-r--r--test/confs/20021
-rw-r--r--test/confs/20031
-rw-r--r--test/confs/20041
-rw-r--r--test/confs/20051
-rw-r--r--test/confs/20061
-rw-r--r--test/confs/20071
-rw-r--r--test/confs/20081
-rw-r--r--test/confs/20091
-rw-r--r--test/confs/20101
-rw-r--r--test/confs/20121
-rw-r--r--test/confs/20131
-rw-r--r--test/confs/20141
-rw-r--r--test/confs/20151
-rw-r--r--test/confs/20161
-rw-r--r--test/confs/20171
-rw-r--r--test/confs/20181
-rw-r--r--test/confs/20191
-rw-r--r--test/confs/20201
-rw-r--r--test/confs/20211
-rw-r--r--test/confs/20221
-rw-r--r--test/confs/20231
-rw-r--r--test/confs/20241
-rw-r--r--test/confs/20251
-rw-r--r--test/confs/20261
-rw-r--r--test/confs/20271
-rw-r--r--test/confs/20281
-rw-r--r--test/confs/20291
-rw-r--r--test/confs/20301
-rw-r--r--test/confs/20311
-rw-r--r--test/confs/20321
-rw-r--r--test/confs/21001
-rw-r--r--test/confs/21011
-rw-r--r--test/confs/21021
-rw-r--r--test/confs/21031
-rw-r--r--test/confs/21041
-rw-r--r--test/confs/21051
-rw-r--r--test/confs/21061
-rw-r--r--test/confs/21071
-rw-r--r--test/confs/21081
-rw-r--r--test/confs/21091
-rw-r--r--test/confs/21101
-rw-r--r--test/confs/21111
-rw-r--r--test/confs/21121
-rw-r--r--test/confs/21131
-rw-r--r--test/confs/21141
-rw-r--r--test/confs/21151
-rw-r--r--test/confs/21161
-rw-r--r--test/confs/21171
-rw-r--r--test/confs/21181
-rw-r--r--test/confs/21191
-rw-r--r--test/confs/21201
-rw-r--r--test/confs/21211
-rw-r--r--test/confs/21221
-rw-r--r--test/confs/21231
-rw-r--r--test/confs/21241
-rw-r--r--test/confs/21251
-rw-r--r--test/confs/21261
-rw-r--r--test/confs/21271
-rw-r--r--test/confs/21281
-rw-r--r--test/confs/21301
-rw-r--r--test/confs/21311
-rw-r--r--test/confs/21321
-rw-r--r--test/confs/21491
-rw-r--r--test/confs/21501
-rw-r--r--test/confs/22001
-rw-r--r--test/confs/22011
-rw-r--r--test/confs/22021
-rw-r--r--test/confs/22501
-rw-r--r--test/confs/23001
-rw-r--r--test/confs/24001
-rw-r--r--test/confs/25001
-rw-r--r--test/confs/25011
-rw-r--r--test/confs/26001
-rw-r--r--test/confs/30001
-rw-r--r--test/confs/31001
-rw-r--r--test/confs/32001
-rw-r--r--test/confs/32011
-rw-r--r--test/confs/32021
-rw-r--r--test/confs/32031
-rw-r--r--test/confs/32041
-rw-r--r--test/confs/32051
-rw-r--r--test/confs/32061
-rw-r--r--test/confs/32071
-rw-r--r--test/confs/32081
-rw-r--r--test/confs/32091
-rw-r--r--test/confs/32101
-rw-r--r--test/confs/32111
-rw-r--r--test/confs/32121
-rw-r--r--test/confs/32131
-rw-r--r--test/confs/33001
-rw-r--r--test/confs/34001
-rw-r--r--test/confs/34011
-rw-r--r--test/confs/34021
-rw-r--r--test/confs/34031
-rw-r--r--test/confs/34041
-rw-r--r--test/confs/34051
-rw-r--r--test/confs/34061
-rw-r--r--test/confs/34071
-rw-r--r--test/confs/34081
-rw-r--r--test/confs/34091
-rw-r--r--test/confs/34101
-rw-r--r--test/confs/34111
-rw-r--r--test/confs/34121
-rw-r--r--test/confs/34131
-rw-r--r--test/confs/34141
-rw-r--r--test/confs/34151
-rw-r--r--test/confs/34161
-rw-r--r--test/confs/34501
-rw-r--r--test/confs/34511
-rw-r--r--test/confs/34521
-rw-r--r--test/confs/34531
-rw-r--r--test/confs/34541
-rw-r--r--test/confs/34551
-rw-r--r--test/confs/34601
-rw-r--r--test/confs/34611
-rw-r--r--test/confs/34621
-rw-r--r--test/confs/34631
-rw-r--r--test/confs/34641
-rw-r--r--test/confs/34651
-rw-r--r--test/confs/35001
-rw-r--r--test/confs/35011
-rw-r--r--test/confs/36001
-rw-r--r--test/confs/40001
-rw-r--r--test/confs/41001
-rw-r--r--test/confs/49501
-rw-r--r--test/confs/50001
-rw-r--r--test/confs/50011
-rw-r--r--test/confs/50021
-rw-r--r--test/confs/50031
-rw-r--r--test/confs/50041
-rw-r--r--test/confs/50051
-rw-r--r--test/confs/50061
-rw-r--r--test/confs/50071
-rw-r--r--test/confs/50081
-rw-r--r--test/confs/50091
-rw-r--r--test/confs/50501
-rw-r--r--test/confs/51001
-rw-r--r--test/confs/51011
-rw-r--r--test/confs/51021
-rw-r--r--test/confs/51031
-rw-r--r--test/confs/52001
-rw-r--r--test/confs/52011
-rw-r--r--test/confs/52021
-rw-r--r--test/confs/52031
-rw-r--r--test/confs/52041
-rw-r--r--test/confs/52051
-rw-r--r--test/confs/52061
-rw-r--r--test/confs/52071
-rw-r--r--test/confs/52081
-rw-r--r--test/confs/52091
-rw-r--r--test/confs/53001
-rw-r--r--test/confs/53011
-rw-r--r--test/confs/54001
-rw-r--r--test/confs/54011
-rw-r--r--test/confs/54101
-rw-r--r--test/confs/54201
-rw-r--r--test/confs/54401
-rw-r--r--test/confs/54501
-rw-r--r--test/confs/55001
-rw-r--r--test/confs/55101
-rw-r--r--test/confs/56001
-rw-r--r--test/confs/56011
-rw-r--r--test/confs/56081
-rw-r--r--test/confs/56501
-rw-r--r--test/confs/56511
-rw-r--r--test/confs/56581
-rw-r--r--test/confs/57001
-rw-r--r--test/confs/57501
-rw-r--r--test/confs/57601
-rw-r--r--test/confs/58201
-rw-r--r--test/confs/58401
-rw-r--r--test/confs/58601
-rw-r--r--test/confs/90001
-rw-r--r--test/confs/90011
-rw-r--r--test/confs/91001
-rw-r--r--test/confs/92001
-rw-r--r--test/confs/93001
-rw-r--r--test/confs/93501
-rw-r--r--test/confs/94001
-rw-r--r--test/confs/94011
-rw-r--r--test/confs/94021
-rw-r--r--test/confs/94501
-rw-r--r--test/confs/99001
-rw-r--r--test/confs/99011
-rw-r--r--test/confs/99021
-rw-r--r--test/confs/99031
-rw-r--r--test/paniclog/00132
-rw-r--r--test/paniclog/01482
-rw-r--r--test/paniclog/02362
-rw-r--r--test/paniclog/02902
-rw-r--r--test/paniclog/03488
-rw-r--r--test/paniclog/041520
-rw-r--r--test/paniclog/04422
-rw-r--r--test/stderr/00132
-rw-r--r--test/stderr/01482
-rw-r--r--test/stderr/02362
-rw-r--r--test/stderr/02902
-rw-r--r--test/stderr/03488
-rw-r--r--test/stderr/041520
-rw-r--r--test/stderr/04422
785 files changed, 63 insertions, 822 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 1486b005c..3419b768b 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 49059a754..cef9c16aa 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 12743499c..c16221fc1 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 5cd738bbb..8cdfb0ee0 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 14db5ae26..ab9ad45f2 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 409bd755f..a6a1581d9 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 53ae39052..5c1382c7c 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 606ab5133..5db3d6a2a 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 d4e976e81..f7d5b8027 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 59ecb0e2c..3f5c25d33 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 1dc7f574b..5e01e1de2 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 2c6b34189..bf2d5b0ea 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 0d944c9da..2049f10e1 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 f39a50b8b..466b97c35 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 ca101e0e1..36aa77762 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 4e1d4730b..f554c9f15 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 70cd8d6ed..08f976a25 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 c7dbdb804..9785f5fe1 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 fbfa534df..e5637556b 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 2d5a9dfc2..5d9d99fdb 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 48c3e9c4d..9a9c2003d 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 7d6437a6d..170a4c1c2 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 442ada688..6143a4d22 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 c31f5e6d9..14fadcd77 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 da9293312..96dccd4af 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 5fa25b0aa..38a844cc9 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 4f79a87b5..2e5e15cb2 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 52a2351bc..a70197579 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 658dcb990..f17e0d5b2 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 5a0c04e13..db267d502 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 8fe398b47..36116e863 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 6cb607e3d..23d6c935d 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 d0c670819..353415c08 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 553491887..c2ba7ab4f 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 15cd5415b..d4452ac3a 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 fc2f22cd2..9d2a0255b 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 6b455fa8a..aef4591e9 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 5fbb0b3ba..8317a0cd2 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 38b377b67..a591b7521 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 83997b39b..218de7b4c 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 ad855ec1a..84385f07a 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 e40799455..6c4c332ae 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 3d989414b..36a7d509b 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 4607d5391..c686bcc02 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 fa488e5bb..996e322e7 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 4d994e4c5..8a3847420 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 b8d1c9a38..301bee438 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 ef431f26e..922944341 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 d6674dcf7..f60aec0ec 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 c70121b32..3c70acc52 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 7695652e2..1e59305b6 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 c0086e441..374dbaf88 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 7966e0379..e2b7279e0 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 db87e2918..8bcfdbab0 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 018aa9527..8e11e7177 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 f483cfe6a..34c05989b 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 58f6a721b..646eee96f 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 aaddd4963..1a0ddd3c6 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 79b2ac345..9f1b0087c 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 22375d062..51fa53b27 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 3dd718359..37bb1987c 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 c23b3062b..f095f3713 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 33cf95f52..b21c5cab5 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 9561c8ce0..0bf8bc4d6 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 b7f9a10c5..84d41498b 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 e3a11ca3a..9becb261f 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 4118128fe..d45c79cef 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 e824e6688..d2de32529 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 95255805c..0f18c5ebb 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 67da00165..8143b632e 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 0094578eb..4d53f3a7e 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 0300bcacc..bc3e88d23 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 4e1e70d45..c03aa20b9 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 77ec017ec..768f7d614 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 e1d76d646..749781c78 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 368db3c51..110d3b1a9 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 8bc9c7c9f..b39477878 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 3fc461392..515330050 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 2a171ea2d..5ed1218ce 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 fad78a5ca..e95ee98da 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 f5df43e10..aef2fd685 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 870453d0b..a9e660a71 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 284f0b0c2..522c9053b 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 36f94f836..cb83d3890 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 23e22a2a3..4bca680a4 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 489b9d70d..b6fe0f453 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 20a106c6f..6cbb42e23 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 395743c4b..30a8cccb8 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 c2a3ebe75..59bd0eea4 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 eb78548e6..2bf285a97 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 4000be1b1..71cdc701c 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 ac956d35f..96aaca6e7 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 f075fdf95..3b7f145c9 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 4cb868f65..ec524c83f 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 1c2e05781..c65a94799 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 9c9097811..15f1f5d1c 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 8d178ff79..c8124fa82 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 f03987c34..fd25acc31 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 c9494151d..f19bec7c1 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 a182a9303..98ac5f85a 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 ad88aee09..9c4f7d931 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 07346c87e..f23da44c6 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 4a13b4937..e54cf628c 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 948d807c1..6d78adf06 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 7d88395b9..ccee4194d 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 dd17eb840..3b3e3d52e 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 7e459b427..bff294a96 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 cef5303c0..e6c15b8c8 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 bdf0eddae..73550b395 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 d58ddea98..bd7cb84f8 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 aba16e8d2..6fd34ce7c 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 18ae75895..bbcb3e57f 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 f2ea8d239..d42a79d58 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 c6ff8c3ed..b02cf5929 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 0af1b33ac..cb95f577f 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 2598c9277..2b3b7bd4a 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 c3f63d0ec..0d1240e29 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 7e4a47cac..8a4595f22 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 1cf1197f3..3f5fb8b4d 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 42752c357..41aaf0d33 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 b9d57cf8a..11b940984 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 f8d42682f..bf517b14d 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 337920d98..a25646b5e 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 85c6b883b..8fd162d09 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 298477092..897c90a92 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 44d1a4c02..b8bc34213 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 501af37ad..df35baf3d 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 33ea902bc..5f156e1f6 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 3ad7297f2..3b74967be 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 226ba04f2..04583de9e 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 9493d33e1..3e95cf8d1 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 53ecd84b2..95271e30c 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 1d6641d92..b03391476 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 3a81fe2dc..5ecdfc395 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 460056972..50ae1db14 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 3b4239216..0ed262a73 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 11b2ab3d9..c43202121 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 607c7613c..08519f38d 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 233d48b4c..4cef8c451 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 7e0cfdad3..014425213 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 b69bf640b..45f3c442a 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 521dcd759..abe4665e4 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 5327de987..3a10b713c 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 b228ba5dc..e3d032431 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 7ae9a7029..275e7e3b6 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 1736e9a1b..672f0f4ec 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 ad18789c9..e1dd55ffb 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 a0b6860a9..116416ec7 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 ed7b7bf86..011b4c6d5 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 34235d101..ae08e6ae2 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 5243b7ae3..a7ad86bee 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 d2cf6d1eb..6a2a2f1c6 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 f200efdb2..c652322c5 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 455d676ba..3bdb03f64 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 db4e56ddb..7f514cd45 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 0cd248785..8272de7d4 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 b604f9b94..0a4b448a6 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 c19c5842c..159d5e2f8 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 3e112458a..cd8ee91ac 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 f24a064db..fcf969a2c 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 05dc9eea9..237896558 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 c59767db5..06789cf36 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 c4f3dc5f9..64be164a9 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 48d493c76..1edac2f4a 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 deb67e5b3..e5409f011 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 c89878959..077b9a41d 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 16d5292f3..4193741c2 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 bcc34bb05..814ea8109 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 050b75f66..5db2c0ae9 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 7d2f06611..c8c20315e 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 1e88e6d43..b74f1fa01 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 8a6d133f6..01db84368 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 a09a3f538..62504656f 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 87c9cceda..e1f773a09 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 0dceb8811..05b023abb 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 1772e9008..ea4cc6059 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 07763aa56..ddde76cb4 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 012408e99..31e11e8ab 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 7fba5b6ab..4f8be4fa5 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 725973b67..48bd6ec5d 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 273d0a7c2..4782202c4 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 f13ae20da..647f5f8eb 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 0aee0c056..39363d4ad 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 7f9d824f8..4f291f492 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 d4e1227e5..a4e38dc78 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 6125ed268..1f0890578 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 73478f438..89b735a5e 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 7b8cc0d0f..1cc0c7bc7 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 08cb1d2c7..d4a5dac1c 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 931319f94..e22f42647 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 e93e4b464..9750ae090 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 60b8b3071..8778e1420 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 98bb2365b..fcf63ff02 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 3b34b0cad..6925a373b 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 410d2bf09..0c7628ca2 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 d67e0bda4..419bc6fb6 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 9410a4d4d..e819e7066 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 bfcaa5060..94f810f05 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 19efd4e41..fd2e76782 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 214f5292b..522cd4bb1 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 175b671cb..96a8e0b8d 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 ab05bf195..de7b1f3bb 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 8c84ee689..2d3f204c7 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 107b63431..9eccd234c 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 284e3848b..69bb69b82 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 da3660c27..77eab7f21 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 f1080e060..64dd19c4c 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 e7db49f7b..a9ff5bbdd 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 42638bcd5..eeff8972f 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 ca3b96eb7..d42392ef4 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 f119bce27..c8981ee76 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 a80fb6de5..1212564d6 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 b9db7a0cc..c8a473915 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 486f1ae3d..9e709f761 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 389437340..89e98a4ea 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 3c0f49d25..1d14d8972 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 16a8a33a8..226ade9ce 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 10e6e7be9..baaa2c06e 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 102fd0ada..0109d89b6 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 04195d153..3250331b1 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 96d97cba4..d1371dd10 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 4458e1846..2a4bff68d 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 b221a88c8..f3538a780 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 ea7f2f58f..095d207e0 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 a05aaae5e..a28af6a16 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 f6f720ec7..412baf220 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 af375c990..93da92c5f 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 9ce4bc492..6b87aa682 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 f10ea4b71..279b84a40 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 8b6a67e45..9ebdb7917 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 06fae3f56..adc942f06 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 dbf4d1299..c143f9bcf 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 af78f1c5c..151ed137c 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 82c0c0432..df25468ed 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 721b8f7e5..beb9da51f 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 99edc2876..be4f39bf0 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 15c605c24..a96661a5f 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 69c8163ee..b94456cb4 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 4856e72a2..ef6da69f6 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 e2402a5f8..a6bd6750c 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 ff0fb76c2..e23daa1cc 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 6ff214e93..6c1e8f3e5 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 8712fb909..a68a76d9d 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 91fcc9e1e..acccc8f8b 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 03d55b135..f907b5f02 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 0acf78fca..dfaa17aab 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 b703f3466..f13453f22 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 f9fb3b525..a144720a6 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 b5a55d4c6..7e87be030 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 57d807825..2cd7c3168 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 eb11b0939..395a8ca62 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 dc34e53e6..5828021ef 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 afeb2f739..8367e24ed 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 06ea63643..78d960932 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 69f04c08b..32e184c44 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 444aa100f..05e2aa626 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 b72de8cd2..cc730cb8d 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 8fdf9f581..799bc699e 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 0de9863d5..8f90f3486 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 d17ee8d9f..1ebdd2b71 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 e0bef95a6..445ef68d0 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 a507987f3..3c13d6c4c 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 cd5c30362..fef46a187 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 40df0612c..c2d9a8bfd 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 62f161f0e..0ac6903aa 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 b884f80d4..0f84c7a5c 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 bbc69923e..417bfeaaa 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 be718bcc9..ffa460296 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 5070e20fc..87ffd2ee9 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 534abaea8..3a151f5df 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 b755a33ca..73dc94b8b 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 6be4e662f..0d22e85d9 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 5c992194c..e7b63605c 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 f05958861..3cd379d50 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 f3fb43846..4e08b8fd1 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 94955d8e9..f4e8604f8 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 48bd71909..180e30f7d 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 72005a6c4..ed318d228 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 b96c65bb9..e4fc444b8 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 96ce20957..e3b3dc485 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 245936a94..47d528656 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 6333840e4..3b47eb751 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 1b8306496..5bcba7951 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 17134c371..389176e60 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 002bb1654..94527a2d2 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 9ebe5ad81..90875f5c0 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 760109c3c..23949cb1f 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 0ec0b0f93..f11e99bc2 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 f58324817..c06762dab 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 b7746b5e7..c5426f45f 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 a355a8b36..8f9105c94 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 938e08ed5..270ffb29e 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 8e526084b..a3d42e8c2 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 929a90740..47b2cec34 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 e7506373c..a3b3277b7 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 1dd0769d0..708909793 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 3a402d410..4f841bb1f 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 f4b9e73be..e1338b022 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 cd85c4525..a273eb2b9 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 194f4043c..4f820bdc3 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 8f6b6d5c6..0e2ca1bd9 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 13c277985..5517f8f5e 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 f956a1836..7487182d5 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 c22dd5d03..4587852ef 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 381324372..813143149 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 1261815ad..f41f6b389 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 b5ffa4573..963d786d6 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 d31627f24..1f292a98c 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 7283f14a5..c208832c7 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 85117e017..a6bf031a9 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 5944b0140..e64a14edd 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 cab9279e7..0d917c772 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 f8ed89e55..13a53b360 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 74ba773ae..aec448cbe 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 34a99b6c5..644cc5eb0 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 a9566983e..b0adf43eb 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 e773e3bf1..7cb021d61 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 78ebf2156..9baef2e20 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 69525e734..61a712e0f 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 b953e6f51..3d836d6c0 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 0c3d9e5fb..efce1f8ee 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 f4872b1b5..a88b37eac 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 62ad75b24..549c55f39 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 d14802b7b..e553a967c 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 c5227a37c..61dcd07ea 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 a33232ee6..34385f708 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 a6d18c5d1..049bf1c1b 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 a725195ae..814239701 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 5310dcc8d..d6f006e7b 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 4b4f49fcc..a8d6c6634 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 c055df0e6..b6d8baa35 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 29d732a60..516012a46 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 4caeab003..58ddc4086 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 d4ab3d46b..a5043257f 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 ff3bf416c..96108ba65 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 f9ad188d6..c7785dc58 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 3e97eb804..3113131f9 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 54c547db3..989f66785 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 b6f6281af..72d9a291a 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 fb6b05f23..ae6136b9a 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 4a8f4e48e..ce80752de 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 506a5ba3a..4c14bc01c 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 720481cca..04b8683df 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 2184b4d8c..aa3a97577 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 1719d5d47..fcb187ac3 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 4c55b2381..be285fd77 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 a69498934..60fa9626c 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 52437504e..9483069ad 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 d0e855f7b..ad35ca5ec 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 770eba91f..560c55699 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 91da97aef..a68f43380 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 ecbc00785..c196b41e8 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 edede234e..65b1083f2 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 47e243d73..c842a2a4f 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 78820f2d9..f67365209 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 a2ae86ff1..67e48371f 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 5fdd04e9e..e090d4850 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 d40b4f553..523257c6e 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 9b86cca2e..8615e0804 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 e93211904..5a9311931 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 560676b14..a83c3899c 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 e66020b69..4a2b7dd20 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 c24f6f10b..5effea5f8 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 0275cbd5c..a00f1029b 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 ea1f39192..b374e1d6e 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 1568939b4..2afdca6aa 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 5b7185d42..9b094f865 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 0ae70d664..141189182 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 54e24e6d4..fb7e872d3 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 930b6467d..4ad94b157 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 f9a8d1ca5..9f6a9d34b 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 91174204e..5afb8e786 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 879b77eb5..40043c47b 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 f1f8a55f3..865dd6a9f 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 a13d7cd3f..679a54bd9 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 af03b3a37..ac2b4bb2f 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 c02973a52..b0407ebd8 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 3c1381b8c..b345a9f28 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 a1322bbed..1c246afa0 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 d86d1dd55..7a0b0fc42 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 a08b49478..729e80cbc 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 9eaca09af..9f1ed6801 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 81a38a284..7fca137e0 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 c6bdb5a3b..8403ccb5c 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 8d930c6dc..4f7304e2c 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 4fad2b69d..e986a284b 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 fbb4029da..1749bfad2 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 225a2430a..f8dce40f6 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 85172e6de..e21e3cb1c 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 f88f1b044..c9715f171 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 c1100f493..5b7d59171 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 0252cbd9e..3806182d8 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 fb9f530f1..b3d5f660a 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 d6e5b9cd8..06932291c 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 d094faa7a..2bea70832 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 d7b0dc7e1..bb6c683eb 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 c7bbf0046..7b1d0fb13 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 1ccbe2e8f..f7dfe9095 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 09861c2de..dda9055e9 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 96e16f6c7..5fd547f1a 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 bce775a2e..99c86ac0a 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 31c561765..b894e46d8 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 7d5215b97..45e68e3c4 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 c7daad9f9..d2721dfeb 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 d77af0c2b..6a267d2b3 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 2adc75704..b231629b8 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 d0bd93de0..dc7f09cbb 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 75a59498e..5fe8c9b50 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 1bffa68f3..8fe224808 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 fa4ad5161..26d4c2d64 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 8be5532d1..5da660ce7 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 e914ae983..9f1af13cb 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 be5b769a4..d84f882ee 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 b8da514f4..6d416fc6a 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 b06489d10..d60c0ae44 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 708cf0a1f..da851b376 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 8ae83dee3..daadb477e 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 84ca827a3..8a3b109f7 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 536eaa6c1..13e61d994 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 08146e259..c2780b0d5 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 4052c570e..12c9f6890 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 7df596962..9cf13e30c 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 72dfc6824..74e7c6978 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 0ac496fd5..4db37bf80 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 a5feb10f0..ba1988103 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 e913725e7..00d8000f3 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 0f5ae85f6..f6c9778e1 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 16b4d6578..657741c2c 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 73e3fb81b..ca5ef4326 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 b61fead03..45ab74fe0 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 156c7ace8..f20028e49 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 60b49e476..fa00a43bf 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 68e7a417a..aa9a4c77a 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 847af4ed2..4a0f8e3c4 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 0cf942225..bdb81372f 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 1f69870de..cbc77885f 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 9183cc0c3..905a6e57f 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 808caa62c..19d7e11ad 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 010f7cce7..a2c43ad94 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 e944668d8..358522b41 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 73ad8b39e..6d050c508 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 2b129db05..9e89feb03 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 1d79e650b..8b3941ce5 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 9c3bb73de..06eb6ecdd 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 12931ec6a..45bd0f31e 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 604abab74..004e1de6a 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 39f07bff9..5f85d8b49 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 d696a9c8e..79f2d1ad6 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 55c65799a..bce937a10 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 f74289fe9..16969e7cd 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 d3ce5f7ed..ecdc5cd41 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 cf70f2513..b42ea187d 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 b67d267ca..1228f0914 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 fa0b0272b..d55634a8f 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 8c24991a9..b95c74bcd 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 59243205b..47efb163f 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 87aa65b58..5ab9f79f2 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 d0c1844ea..c91ca1d36 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 14e4161f2..7b1849d70 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 3adcce54a..c6c8f7ddd 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 162ed5611..4a8ea4a44 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 65fa24080..17ed2b546 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 f04d907fc..86350d230 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 5c3483190..505139b3c 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 5b5110104..033082e89 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 7ff47e6b5..87d0adc35 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 e81afcfb5..8f3a31101 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 1709839b4..49c9d612b 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 32c1664cd..771b67af1 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 575f2ce60..1f9986f5f 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 56011f4a3..14a69f7c6 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 293e061fd..2ef647dc9 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 45901515c..19a345ecc 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 69fd848e4..723041fee 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 df8daa9c2..5fee8d5ff 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 f134e1e00..872feb781 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 acbe1ff8c..ed48ce60c 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 4596e3922..05aec0f69 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 ff050bd53..9ca486541 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 baa3f15a5..c8f76b8c8 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 5296ab4db..ca40ec6be 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 bcdd98069..4938573d7 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 18c32d947..619496b1b 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 c8adb1ba5..b3a585fbb 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 212af518d..b55af8604 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 787c42367..0a09cec72 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 753048bc4..2fc6139a5 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 641006006..2248f9b3d 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 6be2c23ad..cec0b6a3b 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 bebc361bc..ac1ec8671 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 dcf22623b..066de1a97 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 49261fa31..24815fc39 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 70e8dfe17..fe34078bb 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 29a99ba6c..a46b32c6e 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 100fb9a80..934379b54 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 c17b11d98..b2c481178 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 171617496..e96cff519 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 4426c2a67..ff56ff184 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 8706c790b..6af8a6ac7 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 9b03b850f..de16b1b5c 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 23748aedf..1238e800f 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 b00c634ae..c859c64f8 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 ada9e8aa5..bd1cbf5d3 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 b069d2e01..a7305353b 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 258c5e05f..8a85c835d 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 10e2abc4a..aab2adaae 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 bd3ba5b12..c260e6f5d 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 f604f5e5d..5030b55ba 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 f6136a435..4ccba335b 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 fb18b9b95..3ffb75d9e 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 81338cebb..90e6bde3b 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 2920ad6ee..8cd546337 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 16fae0aba..b6978dddf 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 ce40aa35c..a519b9563 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 f76721ac9..10018f62d 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 1b10e218a..a9d049c6b 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 0db220b99..11434516e 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 29fee7e3b..50bbdea02 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 4fb8f5b6c..eb54ff335 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 74445af14..0c0a6ed30 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 1b10c8ea4..5d1fed5aa 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 2c200f07f..5738eebd4 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 c516fa84c..510c698bd 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 65e57ca4e..2d8bb8f62 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 fbd8f9331..15555d8b1 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 6b410b3a5..65fcdbfe2 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 cfb9ea4a5..77a507867 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 0e6550cf6..76f0f0ad6 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 d8f24ae54..bab0c6620 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 7f912b172..58f2f1a18 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 f5a78699e..11c98b9e8 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 69ac8547e..32176400a 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 247f7452a..e87c8afd4 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 b7ad3ffd2..fa2a2fdf9 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 56f679ed8..192e3edaf 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 42d613b19..a00bb6b4c 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 c43b628ee..78e343505 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 b148987a5..259e005da 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 a45a374b7..1e8f63d85 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 0aa7c5201..9d4a8ae72 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 d273af997..8609b1e26 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 5865e3110..65ec0fc32 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 02b7a2622..6df895759 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 641335f6b..ce469a96c 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 0b3be92bf..e5885f41c 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 d22695158..f9f2f10f8 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 e68280b0e..25387f89e 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 ddf95e5ae..23a5f36b2 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 56888183d..8cbbf8b45 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 736c126a8..7d09866c2 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 d5f2fcce7..70519e667 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 6306943de..4cd36d918 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 280d4d06c..29df1260c 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 e08750fdd..088bb1535 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 cecaae490..d47bf4d17 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 3ce775148..bc8b5ae45 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 bdbc8df48..f7345484a 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 edeb977fa..2edb0ff6c 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 07b3a59ca..64e169dea 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 7ed0105ed..2708b01fd 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 3b134db34..6bfb069d3 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 18fe64990..3cdb17fc7 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 c148d9e9d..db1d8b212 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 d5f538461..68bf16b64 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 ecdbf9504..c8ca8a72f 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 51343f61a..ed0ae2b48 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 e10445be7..443d28500 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 c51fd6354..979cfc787 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 83e97fb18..98df1bf7f 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 d56da6949..5eae157f8 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 0987e7ed0..517c38535 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 4c5e5dc06..6cf080737 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 61a9c0801..d8ff26a6f 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 90c233d16..9e7b57ba6 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 5341fc8e8..aa53c717b 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 5520cea4a..99a5866d9 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 00cb5c13c..9597b3f26 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 dfeee38ad..001cd83e1 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 21ce5a47e..c45c3b308 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 1091eea25..bd4f6e950 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 c00a67244..11fd0be57 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 a29187eae..1bbbdd355 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 4a4929bcf..ed19a0e21 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 bc4fff2a4..7a2d34b2f 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 7e49aeda2..e2572df3a 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 69fc749ff..b154c82d3 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 12087aa62..8631514b8 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 280de5304..2979685ec 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 5448bf10c..5b57b60ff 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 908783105..8c1a13da2 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 f3d150694..5bdf76f03 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 029c2f8d2..4bad74a1b 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 11f7bf85b..66fadea29 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 2415c685e..8aede594a 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 023a594a8..59265d407 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 0be277259..331dd09ef 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 f657f060a..562e916fd 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 c062a211b..734c2834a 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 fd53a63eb..f58c9af58 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 14c724546..26b257cd5 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 8c75c536b..4afe33b96 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 8e63c05ae..f3ddd4591 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 6010a555e..7bde46415 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 efc7f76ff..a441e34a3 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 94dff6550..d11dd5e9e 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 30db308a1..2b5efb5d6 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 c59e975de..438899444 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 c19f65e9d..ccb56dcb2 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 d70c5a2db..38900bb53 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 0835fb760..bd15ea944 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 df53268d6..38c14f249 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 1d691be27..b98cf7348 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 4ad1463b3..e89e1c99f 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 a52b21eff..5791316c1 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 5a6099378..002c31391 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 c6a7e698e..dc8ec61ac 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 99fad1a48..a8de8c06d 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 86fce4fdd..38441e9d6 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 db3a4405b..a9bc0ea7f 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 5eb2f703d..610a5b722 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 cd3ffcc99..ec364a3c3 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 c0f76e9c1..d8c685eb5 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 7903eb966..b1e1967b7 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 184abf806..0388d0cc6 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 afbb03d5d..3e151936f 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 1eb7ecb11..2bd3ed656 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 075e11519..9abfc7a1a 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 d21fee064..cbd0babc6 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 d5be24861..d9ac50447 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 c395c73e0..d652c0633 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 fdf184277..8142100aa 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 14a2d1eed..f5a9509e2 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 ab809d081..8bf80f2b8 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 362d08704..7ddc16140 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 646d506aa..de1cd2e22 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 4c9372579..c0225e819 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 dbef1b794..a80e8efbb 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 aed0aefb5..510efdaab 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 6c4843bf0..507159c68 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 132c624c6..930f4b6d5 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 767bb1c4f..20f8e1dfa 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 704346e56..3ea1d9c47 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 862ad710d..786134cae 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 296c27c32..3aa44e8ce 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 9f6de76b4..6354b7cc3 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 53c06f1f7..3d83099d1 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 29822fab8..2b06d6c4a 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 cf67f8cbc..1d649e952 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 015947b71..3b27f41c9 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 dc7dbaa18..3bef13363 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 861db77ba..ae17b7cb4 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 a00457802..7380fb012 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 7a38f0b21..8edb4ae88 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 d8f6f225d..dbfcc40ee 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 563adba1f..649688ff7 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 b0aa957ae..73f82edd2 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 3672b30b6..11fc6acc7 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 09eedef68..11567569a 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 b8273f190..42e19cbe5 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 3d0b17517..4b319e091 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 349c7a524..e86c6f90e 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 6fb89f320..53b274b90 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 97bbfa463..ef4967e5e 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 1ccaf265f..79ace9ea3 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 c4c40d861..58ca672ca 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 8b25b3627..d2f7ae5c9 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 4434db155..a0b4793db 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 e9c59ae17..5229e514f 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 90a85b39d..6bba1ed12 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 518ac3931..77db04192 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 5f399d686..ba9f3aa07 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 a7486df6a..161e869e7 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 953f2c996..e9d0bd60c 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 6fd88679e..1237d295f 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 b0d54ad16..8b1764650 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 e56756543..7ec7fc3be 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 60b1a4624..09b09edba 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 cc24582cd..299603537 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 6adcf65f3..2f12a56f3 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 dc556e961..c804d9386 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 e3141510b..6b9718054 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 a6c262e8b..115133123 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 453e3cade..443376e6a 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 9b90c4bfa..c8b094073 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 a9f35a441..11355fcec 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 283a7b297..a102d40b6 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 c2f00db7b..84a24166c 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 bd8336e9e..09832d895 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 2288119ef..a6b76d16d 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 901386899..3b410c104 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 835484ee6..12be95e5b 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 c5589de86..6785dede0 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 25d00ac1d..26a277a98 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 4f3621b84..052469d14 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 663be3f35..6e411f521 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 9771050f2..0a2a068a7 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 9e059f7ee..727a71d86 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 ab26f43cc..cf7caed4f 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 496bcd8c2..59da15cb8 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 93ab8d8d8..c93abddd7 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 3907aecef..f21651e5e 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 d20d1c30b..1933b8a48 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 495d0d99a..79f0df297 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 2f2061be0..9486f5016 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 343a0b3e1..8853e9440 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 3f458a1bf..521bb789f 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 fca55ff51..c37ccf14d 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 e1275c17d..822f15f78 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 bd6362946..180c6f4d3 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 ef5ce9c59..373aafe2b 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 67089100f..f46ba25a7 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 279bea3d4..9e497261d 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 78dd5bbc6..a21bd7a82 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 66cb72b08..1c0d7639d 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 c88668c9f..eb1a874d9 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 61e22e303..d38387a9e 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 c8cb539fe..24f0361ea 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 a1ac93e55..59df86783 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 9e77ba09e..a9e7a7246 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 aa87fecd1..8da6c6e1b 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 934cf3db2..acda86a55 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 09a3dc891..4f4df39de 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 20b3dbb27..a3bd84f91 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 67679fa92..8d69e3b20 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 32370a766..e195052e0 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 415d2f9a7..aa9997b7f 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 7de922887..58af62e6c 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 33a6f593b..87bc9d0af 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 aeb5e0b10..0a11110b3 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 5846f5b11..5cf753aeb 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 fbbed48cf..5048b1d59 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 d0a3abf9a..7d1c56253 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 73e5ee499..4fb4f767e 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 4f6a981b2..1cd500ff7 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 fb1da45e0..21e27390d 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 6865447e6..70de5631c 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 115604f49..0c130a04f 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 62466983c..09a0aafcf 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 db018a6d4..5978b7fa0 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 bea8e10ba..735b52932 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 2a7ebda1b..f8379c7bd 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 95c434549..479038ad6 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 953b47423..145bdc84e 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 1bc830ef4..6b9e328ba 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 48724213b..083394ee5 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 018ee3a78..2dc1090df 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 1a7320300..785f0c64f 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 6061a1343..311cc1299 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 2b8960366..bf4462be3 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 f09df575b..cffa4107c 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 6a75b8c67..10938e1f9 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 2df63415d..4d0abea55 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 98fd46f7d..13ee1498f 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 03d1a6b0a..303420f3d 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 f1bd09d1c..1b487026f 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 5c0f6a51d..cd9e8b9c3 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 7d9c7551c..d3f6db3c4 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 8f48594fe..8f55b92e2 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 b4177159c..3f0b52362 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 a36b30bc8..0285c801a 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 022e589d9..1aac8b102 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 91365047f..05e88414d 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 4ba8e6d68..e312ee609 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 3f7dbe932..32fe5c90b 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 34f7aad40..cbd030fbe 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 6eb8db5e5..65f8926c3 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 ea5f703aa..43fbde00c 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 3bac99809..eba2f900c 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 86f70033b..a49153ba0 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 730d633fb..b252c4cbb 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 c126b899b..39db98713 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 78e7e579a..c9eb6412c 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 bf2bfc0b3..a2e75ff50 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 66533fed4..003f31154 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 24b6854cc..b519863d3 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 d2c59c2ad..f901fd4cf 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 bedff5d78..7ead00c8e 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 6db126e5a..2dd90dd48 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 78e7e579a..c9eb6412c 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 1b5b73a21..d9ba230b1 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 193370cc8..f8a4205d4 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 cd1712e9f..4aed074e0 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 d2c59c2ad..f901fd4cf 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 062b67be5..b593b1bc8 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 6db126e5a..2dd90dd48 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