Merge branch 'mdw/relayhosts'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 14 Feb 2006 02:52:33 +0000 (02:52 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 14 Feb 2006 02:52:33 +0000 (02:52 +0000)
commit9f4f78697c369f41c86149f8ca24f8d298fc1c9f
tree7b89c46f7af38e8b9ab9ffb9edbe61241f79ad62
parent3abe7b01ff2b4edaa34724277a7ca5ea2cb60304
parent10649f16bd53e42811fef2ffa9daf6914104c42b
Merge branch 'mdw/relayhosts'

* mdw/relayhosts:
  qmail-smtpd: Read list of hosts allowed to relay from control/relayhosts

Conflicts:

qmail-control.9
qmail-showctl.c
qmail-smtpd.c
qmail-control.9
qmail-showctl.c
qmail-smtpd.8
qmail-smtpd.c