Merge branch 'master' of github.com:msimerson/qpsmtpd-dev

This commit is contained in:
Matt Simerson 2012-06-29 20:26:42 -04:00
commit b64d75fc7a

View File

@ -9,7 +9,7 @@
3 ident::p0f p0f p0f 3 ident::p0f p0f p0f
5 karma krm karma 5 karma krm karma
6 dnsbl dbl dnsbl 6 dnsbl dbl dnsbl
7 relay rly relay 7 relay rly relay check_relay,check_norelay,relay_only
9 earlytalker ear early check_earlytalker 9 earlytalker ear early check_earlytalker
15 helo hlo helo check_spamhelo 15 helo hlo helo check_spamhelo
16 tls tls tls 16 tls tls tls
@ -22,13 +22,14 @@
# #
# Authentication # Authentication
# #
30 auth::vpopmail_sql aut vpsql 30 auth::auth_vpopmail_sql aut vpsql
31 auth::vpopmaild vpd vpopd 31 auth::auth_vpopmaild vpd vpopd
32 auth::vpopmail vpo vpop 32 auth::auth_vpopmail vpo vpop
33 auth::checkpasswd ckp chkpw 33 auth::auth_checkpasswd ckp chkpw
34 auth::cvs_unix_local cvs cvsul 34 auth::auth_cvs_unix_local cvs cvsul
35 auth::flat_file flt aflat 35 auth::auth_flat_file flt aflat
36 auth::ldap_bind ldp aldap 36 auth::auth_ldap_bind ldp aldap
37 auth::authdeny dny adeny
# #
# Sender / From # Sender / From
# #