whitelist postfix mynetworks

[Michael H]

Hi All,

I'm having some difficulties creating a whitelist, I initially created
the whitelist like this;

cat /etc/amavisd/whitelist
mydomain1.com
mydomain2.com
mydomain3.com
[...]

cat /etc/amavisd/amavisd.conf
[...]
# bypass header checks for our domains.
@bypass_header_checks_maps = (
   read_hash("/etc/amavisd/whitelist"),
);

# bypass spam checks for our domains.
@bypass_spam_checks_maps = (
   read_hash("/etc/amavisd/whitelist"),
);

# bypass banned checks maps for our domains.
@bypass_banned_checks_maps = (
   read_hash("/etc/amavisd/whitelist"),
);
[...]

Based on our domain names, I see the error in my ways, faked envelope
addresses are still getting in.

---------------------------------

I would much prefer to use the same whitelist as I currently have in
postfix using my client-list;

cat /etc/postfix/main.cf
[...]
mynetworks = cidr:/etc/postfix/client-list
[...]


cat /etc/postfix/master.cf
[...]
# amavisd listener -
smtp-amavis unix -    -    n    -   10  smtp
    -o smtp_data_done_timeout=1200
    -o smtp_send_xforward_command=yes
    -o disable_dns_lookups=yes
127.0.0.1:10025 inet n    -    n    -    10 smtpd
    -o content_filter=
    -o local_recipient_maps=
    -o relay_recipient_maps=
    -o smtpd_restriction_classes=
    -o smtpd_client_restrictions=
    -o smtpd_helo_restrictions=
    -o smtpd_sender_restrictions=permit_mynetworks
    -o smtpd_recipient_restrictions=permit_mynetworks,reject
    -o mynetworks=127.0.0.0/8
    -o strict_rfc821_envelopes=yes
    -o smtpd_error_sleep_time=0
    -o smtpd_soft_error_limit=1001
    -o smtpd_hard_error_limit=1000
[...]

Once I switched my configurations over I have an alarm system that is
unable to email due to;
INVALID HEADER
Missing required header field: "Date"

The IP address of this system is in my client-list.

How can I make amavisd honour my postfix client-list without having to
maintain two separate files?

Thanks in advance,

Michael