(Re-)apply NetBSD specific patches.
This commit is contained in:
tron
parent
41fbaed053
commit
b492933390
@ -179,7 +179,7 @@ verification for specific domains that often appear in forged email.
|
||||
|
||||
# Note 1: Be sure to read the "Caching" section below!
|
||||
# Note 2: Avoid hash files here. Use btree instead.
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
|
||||
/etc/postfix/sender_access:
|
||||
aol.com reject_unverified_sender
|
||||
@ -218,7 +218,7 @@ be blocked:
|
||||
|
||||
# Note 1: Be sure to read the "Caching" section below!
|
||||
# Note 2: Avoid hash files here. Use btree instead.
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
|
||||
This is also a good way to populate your cache with address verification
|
||||
results before you start to actually reject mail.
|
||||
@ -279,7 +279,7 @@ If your /var file system has sufficient space, try:
|
||||
|
||||
/etc/postfix/main.cf:
|
||||
# Note: avoid hash files here. Use btree instead.
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
|
||||
NOTE 1: As of version 2.5, Postfix no longer uses root privileges when opening
|
||||
this file. The file should now be stored under the Postfix-owned
|
||||
|
||||
@ -201,7 +201,7 @@ Parameters whose defaults can be specified in this way are:
|
||||
|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
|
||||
|DEF_DAEMON_DIR |daemon_directory |/usr/libexec/postfix|
|
||||
|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
|
||||
|DEF_DATA_DIR |data_directory |/var/lib/postfix |
|
||||
|DEF_DATA_DIR |data_directory |/var/db/postfix |
|
||||
|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
|
||||
|DEF_MAILQ_PATH |mailq_path |/usr/bin/mailq |
|
||||
|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
|
||||
|
||||
@ -428,7 +428,7 @@ is high.
|
||||
Example:
|
||||
|
||||
/etc/postfix/main.cf:
|
||||
smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
|
||||
smtpd_tls_session_cache_database = btree:/var/db/postfix/smtpd_scache
|
||||
|
||||
Note: as of version 2.5, Postfix no longer uses root privileges when opening
|
||||
this file. The file should now be stored under the Postfix-owned
|
||||
@ -777,7 +777,7 @@ client is allowed to negotiate per unit time.
|
||||
Example:
|
||||
|
||||
/etc/postfix/main.cf:
|
||||
smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
|
||||
smtp_tls_session_cache_database = btree:/var/db/postfix/smtp_scache
|
||||
|
||||
Note: as of version 2.5, Postfix no longer uses root privileges when opening
|
||||
this file. The file should now be stored under the Postfix-owned
|
||||
@ -1820,7 +1820,7 @@ state the next time it starts up. This file is created when it does not exist.
|
||||
Examples:
|
||||
|
||||
/etc/postfix/main.cf:
|
||||
tls_random_exchange_name = /var/lib/postfix/prng_exch
|
||||
tls_random_exchange_name = /var/db/postfix/prng_exch
|
||||
tls_random_prng_update_period = 3600s
|
||||
|
||||
As of version 2.5, Postfix no longer uses root privileges when opening this
|
||||
@ -1941,14 +1941,14 @@ indicates a super-user shell.
|
||||
/etc/postfix/main.cf:
|
||||
smtp_tls_CAfile = /etc/postfix/cacert.pem
|
||||
smtp_tls_session_cache_database =
|
||||
btree:/var/lib/postfix/smtp_tls_session_cache
|
||||
btree:/var/db/postfix/smtp_tls_session_cache
|
||||
smtp_tls_security_level = may
|
||||
smtpd_tls_CAfile = /etc/postfix/cacert.pem
|
||||
smtpd_tls_cert_file = /etc/postfix/foo-cert.pem
|
||||
smtpd_tls_key_file = /etc/postfix/foo-key.pem
|
||||
smtpd_tls_received_header = yes
|
||||
smtpd_tls_session_cache_database =
|
||||
btree:/var/lib/postfix/smtpd_tls_session_cache
|
||||
btree:/var/db/postfix/smtpd_tls_session_cache
|
||||
tls_random_source = dev:/dev/urandom
|
||||
# Postfix 2.3 and later
|
||||
smtpd_tls_security_level = may
|
||||
|
||||
28
external/ibm-public/postfix/dist/conf/main.cf
vendored
28
external/ibm-public/postfix/dist/conf/main.cf
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: main.cf,v 1.1.1.1 2009/06/23 10:08:23 tron Exp $
|
||||
# $NetBSD: main.cf,v 1.2 2009/06/23 11:41:06 tron Exp $
|
||||
#
|
||||
# Global Postfix configuration file. This file lists only a subset
|
||||
# of all parameters. For the syntax, and for a complete parameter
|
||||
@ -47,7 +47,7 @@ daemon_directory = /usr/libexec/postfix
|
||||
# data files (caches, random numbers). This directory must be owned
|
||||
# by the mail_owner account (see below).
|
||||
#
|
||||
data_directory = /var/lib/postfix
|
||||
data_directory = /var/db/postfix
|
||||
|
||||
# QUEUE AND PROCESS OWNERSHIP
|
||||
#
|
||||
@ -107,6 +107,10 @@ mail_owner = postfix
|
||||
# the software claims all active interfaces on the machine. The
|
||||
# parameter also controls delivery of mail to user@[ip.address].
|
||||
#
|
||||
# NOTE: On NetBSD, postfix does not listen on the network by default.
|
||||
# To enable inbound mail reception once your configuration is
|
||||
# ready, uncomment the smtp service in /etc/postfix/master.cf
|
||||
#
|
||||
# See also the proxy_interfaces parameter, for network addresses that
|
||||
# are forwarded to us via a proxy or network address translator.
|
||||
#
|
||||
@ -116,6 +120,10 @@ mail_owner = postfix
|
||||
#inet_interfaces = $myhostname
|
||||
#inet_interfaces = $myhostname, localhost
|
||||
|
||||
# NetBSD is IPv6-capable. Use all available address families.
|
||||
#
|
||||
inet_protocols = all
|
||||
|
||||
# The proxy_interfaces parameter specifies the network interface
|
||||
# addresses that this mail system receives mail on by way of a
|
||||
# proxy or network address translation unit. This setting extends
|
||||
@ -617,37 +625,37 @@ debugger_command =
|
||||
# sendmail_path: The full pathname of the Postfix sendmail command.
|
||||
# This is the Sendmail-compatible mail posting interface.
|
||||
#
|
||||
sendmail_path =
|
||||
sendmail_path = /usr/sbin/sendmail
|
||||
|
||||
# newaliases_path: The full pathname of the Postfix newaliases command.
|
||||
# This is the Sendmail-compatible command to build alias databases.
|
||||
#
|
||||
newaliases_path =
|
||||
newaliases_path = /usr/bin/newaliases
|
||||
|
||||
# mailq_path: The full pathname of the Postfix mailq command. This
|
||||
# is the Sendmail-compatible mail queue listing command.
|
||||
#
|
||||
mailq_path =
|
||||
mailq_path = /usr/bin/mailq
|
||||
|
||||
# setgid_group: The group for mail submission and queue management
|
||||
# commands. This must be a group name with a numerical group ID that
|
||||
# is not shared with other accounts, not even with the Postfix account.
|
||||
#
|
||||
setgid_group =
|
||||
setgid_group = maildrop
|
||||
|
||||
# html_directory: The location of the Postfix HTML documentation.
|
||||
#
|
||||
html_directory =
|
||||
html_directory = /usr/share/doc/html/postfix
|
||||
|
||||
# manpage_directory: The location of the Postfix on-line manual pages.
|
||||
#
|
||||
manpage_directory =
|
||||
manpage_directory = /usr/share/man
|
||||
|
||||
# sample_directory: The location of the Postfix sample configuration files.
|
||||
# This parameter is obsolete as of Postfix 2.1.
|
||||
#
|
||||
sample_directory =
|
||||
sample_directory = /usr/share/examples/postfix
|
||||
|
||||
# readme_directory: The location of the Postfix README files.
|
||||
#
|
||||
readme_directory =
|
||||
readme_directory = /usr/share/examples/postfix
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: master.cf,v 1.1.1.1 2009/06/23 10:08:23 tron Exp $
|
||||
# $NetBSD: master.cf,v 1.2 2009/06/23 11:41:06 tron Exp $
|
||||
#
|
||||
#
|
||||
# Postfix master process configuration file. For details on the format
|
||||
@ -10,7 +10,7 @@
|
||||
# service type private unpriv chroot wakeup maxproc command + args
|
||||
# (yes) (yes) (yes) (never) (100)
|
||||
# ==========================================================================
|
||||
smtp inet n - n - - smtpd
|
||||
#smtp inet n - n - - smtpd
|
||||
#submission inet n - n - - smtpd
|
||||
# -o smtpd_tls_security_level=encrypt
|
||||
# -o smtpd_sasl_auth_enable=yes
|
||||
@ -24,7 +24,7 @@ smtp inet n - n - - smtpd
|
||||
#628 inet n - n - - qmqpd
|
||||
pickup fifo n - n 60 1 pickup
|
||||
cleanup unix n - n - 0 cleanup
|
||||
qmgr fifo n - n 300 1 qmgr
|
||||
qmgr unix n - n 300 1 qmgr
|
||||
#qmgr fifo n - n 300 1 oqmgr
|
||||
tlsmgr unix - - n 1000? 1 tlsmgr
|
||||
rewrite unix - - n - - trivial-rewrite
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
# $NetBSD: postfix-files,v 1.1.1.1 2009/06/23 10:08:23 tron Exp $
|
||||
# $NetBSD: postfix-files,v 1.2 2009/06/23 11:41:06 tron Exp $
|
||||
#
|
||||
# Commented out entries mean files not installed under NetBSD.
|
||||
#
|
||||
# Do not edit this file.
|
||||
#
|
||||
@ -86,7 +87,7 @@ $daemon_directory/postfix-wrapper:f:root:-:755
|
||||
$daemon_directory/postmulti-script:f:root:-:755
|
||||
$daemon_directory/proxymap:f:root:-:755
|
||||
$daemon_directory/qmgr:f:root:-:755
|
||||
$daemon_directory/qmqpd:f:root:-:755
|
||||
#$daemon_directory/qmqpd:f:root:-:755
|
||||
$daemon_directory/scache:f:root:-:755
|
||||
$daemon_directory/showq:f:root:-:755
|
||||
$daemon_directory/smtp:f:root:-:755
|
||||
@ -113,28 +114,28 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u
|
||||
$sendmail_path:f:root:-:755
|
||||
$newaliases_path:l:$sendmail_path
|
||||
$mailq_path:l:$sendmail_path
|
||||
$config_directory/LICENSE:f:root:-:644:1
|
||||
$config_directory/TLS_LICENSE:f:root:-:644:1
|
||||
$config_directory/access:f:root:-:644:p1
|
||||
$config_directory/aliases:f:root:-:644:p1
|
||||
$config_directory/bounce.cf.default:f:root:-:644:1
|
||||
$config_directory/canonical:f:root:-:644:p1
|
||||
$config_directory/cidr_table:f:root:-:644:o
|
||||
$config_directory/generic:f:root:-:644:p1
|
||||
$sample_directory/LICENSE:f:root:-:644:1
|
||||
$sample_directory/TLS_LICENSE:f:root:-:644:1
|
||||
$sample_directory/access:f:root:-:644:p1
|
||||
$sample_directory/aliases:f:root:-:644:p1
|
||||
$sample_directory/bounce.cf.default:f:root:-:644:1
|
||||
$sample_directory/canonical:f:root:-:644:p1
|
||||
$sample_directory/cidr_table:f:root:-:644:o
|
||||
$sample_directory/generic:f:root:-:644:p1
|
||||
$config_directory/generics:f:root:-:644:o
|
||||
$config_directory/header_checks:f:root:-:644:p1
|
||||
$sample_directory/header_checks:f:root:-:644:p1
|
||||
$config_directory/install.cf:f:root:-:644:o
|
||||
$config_directory/main.cf.default:f:root:-:644:1
|
||||
#$config_directory/main.cf.default:f:root:-:644:1
|
||||
$config_directory/main.cf:f:root:-:644:p
|
||||
$config_directory/makedefs.out:f:root:-:644:1
|
||||
#$config_directory/makedefs.out:f:root:-:644:1
|
||||
$config_directory/master.cf:f:root:-:644:p
|
||||
$config_directory/pcre_table:f:root:-:644:o
|
||||
$config_directory/postfix-files:f:root:-:644:o
|
||||
$config_directory/regexp_table:f:root:-:644:o
|
||||
$config_directory/relocated:f:root:-:644:p1
|
||||
$sample_directory/relocated:f:root:-:644:p1
|
||||
$config_directory/tcp_table:f:root:-:644:o
|
||||
$config_directory/transport:f:root:-:644:p1
|
||||
$config_directory/virtual:f:root:-:644:p1
|
||||
$sample_directory/transport:f:root:-:644:p1
|
||||
$sample_directory/virtual:f:root:-:644:p1
|
||||
$config_directory/postfix-script:f:root:-:755:o
|
||||
$config_directory/postfix-script-sgid:f:root:-:755:o
|
||||
$config_directory/postfix-script-nosgid:f:root:-:755:o
|
||||
@ -153,9 +154,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644
|
||||
$manpage_directory/man1/postmulti.1:f:root:-:644
|
||||
$manpage_directory/man1/postqueue.1:f:root:-:644
|
||||
$manpage_directory/man1/postsuper.1:f:root:-:644
|
||||
$manpage_directory/man1/sendmail.1:f:root:-:644
|
||||
#$manpage_directory/man1/sendmail.1:f:root:-:644
|
||||
$manpage_directory/man5/access.5:f:root:-:644
|
||||
$manpage_directory/man5/aliases.5:f:root:-:644
|
||||
#$manpage_directory/man5/aliases.5:f:root:-:644
|
||||
$manpage_directory/man5/body_checks.5:f:root:-:644
|
||||
$manpage_directory/man5/bounce.5:f:root:-:644
|
||||
$manpage_directory/man5/canonical.5:f:root:-:644
|
||||
@ -163,17 +164,17 @@ $manpage_directory/man5/cidr_table.5:f:root:-:644
|
||||
$manpage_directory/man5/generics.5:f:root:-:644:o
|
||||
$manpage_directory/man5/generic.5:f:root:-:644
|
||||
$manpage_directory/man5/header_checks.5:f:root:-:644
|
||||
$manpage_directory/man5/ldap_table.5:f:root:-:644
|
||||
#$manpage_directory/man5/ldap_table.5:f:root:-:644
|
||||
$manpage_directory/man5/master.5:f:root:-:644
|
||||
$manpage_directory/man5/mysql_table.5:f:root:-:644
|
||||
#$manpage_directory/man5/mysql_table.5:f:root:-:644
|
||||
$manpage_directory/man5/nisplus_table.5:f:root:-:644
|
||||
$manpage_directory/man5/pcre_table.5:f:root:-:644
|
||||
$manpage_directory/man5/pgsql_table.5:f:root:-:644
|
||||
#$manpage_directory/man5/pgsql_table.5:f:root:-:644
|
||||
$manpage_directory/man5/postconf.5:f:root:-:644
|
||||
$manpage_directory/man5/postfix-wrapper.5:f:root:-:644
|
||||
$manpage_directory/man5/regexp_table.5:f:root:-:644
|
||||
$manpage_directory/man5/relocated.5:f:root:-:644
|
||||
$manpage_directory/man5/tcp_table.5:f:root:-:644
|
||||
#$manpage_directory/man5/tcp_table.5:f:root:-:644
|
||||
$manpage_directory/man5/transport.5:f:root:-:644
|
||||
$manpage_directory/man5/virtual.5:f:root:-:644
|
||||
$manpage_directory/man8/bounce.8:f:root:-:644
|
||||
@ -192,7 +193,7 @@ $manpage_directory/man8/pickup.8:f:root:-:644
|
||||
$manpage_directory/man8/pipe.8:f:root:-:644
|
||||
$manpage_directory/man8/proxymap.8:f:root:-:644
|
||||
$manpage_directory/man8/qmgr.8:f:root:-:644
|
||||
$manpage_directory/man8/qmqpd.8:f:root:-:644
|
||||
#$manpage_directory/man8/qmqpd.8:f:root:-:644
|
||||
$manpage_directory/man8/scache.8:f:root:-:644
|
||||
$manpage_directory/man8/showq.8:f:root:-:644
|
||||
$manpage_directory/man8/smtp.8:f:root:-:644
|
||||
@ -242,7 +243,7 @@ $readme_directory/ADDRESS_VERIFICATION_README:f:root:-:644
|
||||
$readme_directory/BACKSCATTER_README:f:root:-:644
|
||||
$readme_directory/BASIC_CONFIGURATION_README:f:root:-:644
|
||||
$readme_directory/BUILTIN_FILTER_README:f:root:-:644
|
||||
$readme_directory/CDB_README:f:root:-:644
|
||||
#$readme_directory/CDB_README:f:root:-:644
|
||||
$readme_directory/CONNECTION_CACHE_README:f:root:-:644
|
||||
$readme_directory/CONTENT_INSPECTION_README:f:root:-:644
|
||||
$readme_directory/DATABASE_README:f:root:-:644
|
||||
@ -252,10 +253,10 @@ $readme_directory/DSN_README:f:root:-:644
|
||||
$readme_directory/ETRN_README:f:root:-:644
|
||||
$readme_directory/FILTER_README:f:root:-:644
|
||||
$readme_directory/HOSTING_README:f:root:-:644:o
|
||||
$readme_directory/INSTALL:f:root:-:644
|
||||
#$readme_directory/INSTALL:f:root:-:644
|
||||
$readme_directory/IPV6_README:f:root:-:644
|
||||
$readme_directory/LDAP_README:f:root:-:644
|
||||
$readme_directory/LINUX_README:f:root:-:644
|
||||
#$readme_directory/LINUX_README:f:root:-:644
|
||||
$readme_directory/LOCAL_RECIPIENT_README:f:root:-:644
|
||||
$readme_directory/MACOSX_README:f:root:-:644:o
|
||||
$readme_directory/MAILDROP_README:f:root:-:644
|
||||
@ -264,7 +265,7 @@ $readme_directory/MULTI_INSTANCE_README:f:root:-:644
|
||||
$readme_directory/MYSQL_README:f:root:-:644
|
||||
$readme_directory/NFS_README:f:root:-:644
|
||||
$readme_directory/OVERVIEW:f:root:-:644
|
||||
$readme_directory/PACKAGE_README:f:root:-:644
|
||||
#$readme_directory/PACKAGE_README:f:root:-:644
|
||||
$readme_directory/PCRE_README:f:root:-:644
|
||||
$readme_directory/PGSQL_README:f:root:-:644
|
||||
$readme_directory/QMQP_README:f:root:-:644:o
|
||||
@ -281,7 +282,7 @@ $readme_directory/STRESS_README:f:root:-:644
|
||||
$readme_directory/TLS_LEGACY_README:f:root:-:644
|
||||
$readme_directory/TLS_README:f:root:-:644
|
||||
$readme_directory/TUNING_README:f:root:-:644
|
||||
$readme_directory/ULTRIX_README:f:root:-:644
|
||||
#$readme_directory/ULTRIX_README:f:root:-:644
|
||||
$readme_directory/UUCP_README:f:root:-:644
|
||||
$readme_directory/VERP_README:f:root:-:644
|
||||
$readme_directory/VIRTUAL_README:f:root:-:644
|
||||
@ -293,20 +294,20 @@ $html_directory/ADDRESS_VERIFICATION_README.html:f:root:-:644
|
||||
$html_directory/BACKSCATTER_README.html:f:root:-:644
|
||||
$html_directory/BASIC_CONFIGURATION_README.html:f:root:-:644
|
||||
$html_directory/BUILTIN_FILTER_README.html:f:root:-:644
|
||||
$html_directory/CDB_README.html:f:root:-:644
|
||||
#$html_directory/CDB_README.html:f:root:-:644
|
||||
$html_directory/CONNECTION_CACHE_README.html:f:root:-:644
|
||||
$html_directory/CONTENT_INSPECTION_README.html:f:root:-:644
|
||||
$html_directory/CYRUS_README.html:f:root:-:644:o
|
||||
#$html_directory/CYRUS_README.html:f:root:-:644:o
|
||||
$html_directory/DATABASE_README.html:f:root:-:644
|
||||
$html_directory/DB_README.html:f:root:-:644
|
||||
$html_directory/DEBUG_README.html:f:root:-:644
|
||||
$html_directory/DSN_README.html:f:root:-:644
|
||||
$html_directory/ETRN_README.html:f:root:-:644
|
||||
$html_directory/FILTER_README.html:f:root:-:644
|
||||
$html_directory/INSTALL.html:f:root:-:644
|
||||
#$html_directory/INSTALL.html:f:root:-:644
|
||||
$html_directory/IPV6_README.html:f:root:-:644
|
||||
$html_directory/LDAP_README.html:f:root:-:644
|
||||
$html_directory/LINUX_README.html:f:root:-:644
|
||||
#$html_directory/LINUX_README.html:f:root:-:644
|
||||
$html_directory/LOCAL_RECIPIENT_README.html:f:root:-:644
|
||||
$html_directory/MAILDROP_README.html:f:root:-:644
|
||||
$html_directory/MILTER_README.html:f:root:-:644
|
||||
@ -330,7 +331,7 @@ $html_directory/STRESS_README.html:f:root:-:644
|
||||
$html_directory/TLS_LEGACY_README.html:f:root:-:644
|
||||
$html_directory/TLS_README.html:f:root:-:644
|
||||
$html_directory/TUNING_README.html:f:root:-:644
|
||||
$html_directory/ULTRIX_README.html:f:root:-:644:o
|
||||
#$html_directory/ULTRIX_README.html:f:root:-:644:o
|
||||
$html_directory/UUCP_README.html:f:root:-:644
|
||||
$html_directory/VERP_README.html:f:root:-:644
|
||||
$html_directory/VIRTUAL_README.html:f:root:-:644
|
||||
@ -384,9 +385,9 @@ $html_directory/postsuper.1.html:f:root:-:644
|
||||
$html_directory/qshape.1.html:f:root:-:644
|
||||
$html_directory/proxymap.8.html:f:root:-:644
|
||||
$html_directory/qmgr.8.html:f:root:-:644
|
||||
$html_directory/qmqp-sink.1.html:f:root:-:644
|
||||
$html_directory/qmqp-source.1.html:f:root:-:644
|
||||
$html_directory/qmqpd.8.html:f:root:-:644
|
||||
#$html_directory/qmqp-sink.1.html:f:root:-:644
|
||||
#$html_directory/qmqp-source.1.html:f:root:-:644
|
||||
#$html_directory/qmqpd.8.html:f:root:-:644
|
||||
$html_directory/regexp_table.5.html:f:root:-:644
|
||||
$html_directory/relocated.5.html:f:root:-:644
|
||||
$html_directory/sendmail.1.html:h:$html_directory/mailq.1.html:-:644
|
||||
@ -396,7 +397,7 @@ $html_directory/smtp-source.1.html:f:root:-:644
|
||||
$html_directory/smtp.8.html:h:$html_directory/lmtp.8.html:-:644
|
||||
$html_directory/smtpd.8.html:f:root:-:644
|
||||
$html_directory/spawn.8.html:f:root:-:644
|
||||
$html_directory/tcp_table.5.html:f:root:-:644
|
||||
#$html_directory/tcp_table.5.html:f:root:-:644
|
||||
$html_directory/trace.8.html:h:$html_directory/bounce.8.html:-:644
|
||||
$html_directory/transport.5.html:f:root:-:644
|
||||
$html_directory/trivial-rewrite.8.html:f:root:-:644
|
||||
|
||||
@ -301,7 +301,7 @@ in forged email. </p>
|
||||
|
||||
# Note 1: Be sure to read the "<a href="#caching">Caching</a>" section below!
|
||||
# Note 2: Avoid hash files here. Use btree instead.
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/lib/postfix/verify
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/db/postfix/verify
|
||||
|
||||
/etc/postfix/sender_access:
|
||||
aol.com <a href="postconf.5.html#reject_unverified_sender">reject_unverified_sender</a>
|
||||
@ -346,7 +346,7 @@ you can see what mail would be blocked: </p>
|
||||
|
||||
# Note 1: Be sure to read the "<a href="#caching">Caching</a>" section below!
|
||||
# Note 2: Avoid hash files here. Use btree instead.
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/lib/postfix/verify
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/db/postfix/verify
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
@ -424,7 +424,7 @@ stop". </p>
|
||||
<pre>
|
||||
/etc/postfix/<a href="postconf.5.html">main.cf</a>:
|
||||
# Note: avoid hash files here. Use btree instead.
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/lib/postfix/verify
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/db/postfix/verify
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
|
||||
@ -309,7 +309,7 @@ default</th> </tr>
|
||||
<td>/usr/libexec/postfix</td> </tr>
|
||||
|
||||
<tr> <td>DEF_DATA_DIR</td> <td><a href="postconf.5.html#data_directory">data_directory</a></td>
|
||||
<td>/var/lib/postfix</td> </tr>
|
||||
<td>/var/db/postfix</td> </tr>
|
||||
|
||||
<tr> <td>DEF_MAILQ_PATH</td> <td><a href="postconf.5.html#mailq_path">mailq_path</a></td> <td>/usr/bin/mailq</td>
|
||||
</tr>
|
||||
|
||||
@ -639,7 +639,7 @@ the cost of repeatedly negotiating TLS session keys is high.</p>
|
||||
<blockquote>
|
||||
<pre>
|
||||
/etc/postfix/<a href="postconf.5.html">main.cf</a>:
|
||||
<a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/var/lib/postfix/smtpd_scache
|
||||
<a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/var/db/postfix/smtpd_scache
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
@ -1129,7 +1129,7 @@ is allowed to negotiate per unit time.</p>
|
||||
<blockquote>
|
||||
<pre>
|
||||
/etc/postfix/<a href="postconf.5.html">main.cf</a>:
|
||||
<a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/var/lib/postfix/smtp_scache
|
||||
<a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/var/db/postfix/smtp_scache
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
@ -2453,7 +2453,7 @@ This file is created when it does not exist. </p>
|
||||
<blockquote>
|
||||
<pre>
|
||||
/etc/postfix/<a href="postconf.5.html">main.cf</a>:
|
||||
<a href="postconf.5.html#tls_random_exchange_name">tls_random_exchange_name</a> = /var/lib/postfix/prng_exch
|
||||
<a href="postconf.5.html#tls_random_exchange_name">tls_random_exchange_name</a> = /var/db/postfix/prng_exch
|
||||
<a href="postconf.5.html#tls_random_prng_update_period">tls_random_prng_update_period</a> = 3600s
|
||||
</pre>
|
||||
</blockquote>
|
||||
@ -2598,14 +2598,14 @@ but don't require them from all clients. </p>
|
||||
/etc/postfix/<a href="postconf.5.html">main.cf</a>:
|
||||
<a href="postconf.5.html#smtp_tls_CAfile">smtp_tls_CAfile</a> = /etc/postfix/cacert.pem
|
||||
<a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> =
|
||||
btree:/var/lib/postfix/smtp_tls_session_cache
|
||||
btree:/var/db/postfix/smtp_tls_session_cache
|
||||
<a href="postconf.5.html#smtp_tls_security_level">smtp_tls_security_level</a> = may
|
||||
<a href="postconf.5.html#smtpd_tls_CAfile">smtpd_tls_CAfile</a> = /etc/postfix/cacert.pem
|
||||
<a href="postconf.5.html#smtpd_tls_cert_file">smtpd_tls_cert_file</a> = /etc/postfix/foo-cert.pem
|
||||
<a href="postconf.5.html#smtpd_tls_key_file">smtpd_tls_key_file</a> = /etc/postfix/foo-key.pem
|
||||
<a href="postconf.5.html#smtpd_tls_received_header">smtpd_tls_received_header</a> = yes
|
||||
<a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> =
|
||||
btree:/var/lib/postfix/smtpd_tls_session_cache
|
||||
btree:/var/db/postfix/smtpd_tls_session_cache
|
||||
<a href="postconf.5.html#tls_random_source">tls_random_source</a> = dev:/dev/urandom
|
||||
# Postfix 2.3 and later
|
||||
<a href="postconf.5.html#smtpd_tls_security_level">smtpd_tls_security_level</a> = may
|
||||
|
||||
@ -182,8 +182,8 @@ Examples:
|
||||
</p>
|
||||
|
||||
<pre>
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = hash:/var/lib/postfix/verify
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/lib/postfix/verify
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = hash:/var/db/postfix/verify
|
||||
<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/db/postfix/verify
|
||||
</pre>
|
||||
|
||||
<p>
|
||||
@ -8548,7 +8548,7 @@ passwords, and requires that Postfix is compiled with TLS support.
|
||||
<p> Example: </p>
|
||||
|
||||
<pre>
|
||||
<a href="postconf.5.html#smtp_sasl_auth_cache_name">smtp_sasl_auth_cache_name</a> = <a href="proxymap.8.html">proxy</a>:btree:/var/lib/postfix/sasl_auth_cache
|
||||
<a href="postconf.5.html#smtp_sasl_auth_cache_name">smtp_sasl_auth_cache_name</a> = <a href="proxymap.8.html">proxy</a>:btree:/var/db/postfix/sasl_auth_cache
|
||||
</pre>
|
||||
|
||||
<p> This feature is available in Postfix 2.5 and later. </p>
|
||||
@ -9947,7 +9947,7 @@ under a non-Postfix directory is redirected to the Postfix-owned
|
||||
<p> Example: </p>
|
||||
|
||||
<pre>
|
||||
<a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/var/lib/postfix/smtp_scache
|
||||
<a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/var/db/postfix/smtp_scache
|
||||
</pre>
|
||||
|
||||
<p> This feature is available in Postfix 2.2 and later. </p>
|
||||
@ -12993,7 +12993,7 @@ under a non-Postfix directory is redirected to the Postfix-owned
|
||||
<p> Example: </p>
|
||||
|
||||
<pre>
|
||||
<a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/var/lib/postfix/smtpd_scache
|
||||
<a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/var/db/postfix/smtpd_scache
|
||||
</pre>
|
||||
|
||||
<p> This feature is available in Postfix 2.2 and later. </p>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: postconf.5,v 1.1.1.1 2009/06/23 10:08:34 tron Exp $
|
||||
.\" $NetBSD: postconf.5,v 1.2 2009/06/23 11:41:06 tron Exp $
|
||||
.\"
|
||||
.TH POSTCONF 5
|
||||
.SH NAME
|
||||
@ -112,8 +112,8 @@ Examples:
|
||||
.nf
|
||||
.na
|
||||
.ft C
|
||||
address_verify_map = hash:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = hash:/var/db/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
.fi
|
||||
.ad
|
||||
.ft R
|
||||
@ -4836,7 +4836,7 @@ Example:
|
||||
.nf
|
||||
.na
|
||||
.ft C
|
||||
smtp_sasl_auth_cache_name = proxy:btree:/var/lib/postfix/sasl_auth_cache
|
||||
smtp_sasl_auth_cache_name = proxy:btree:/var/db/postfix/sasl_auth_cache
|
||||
.fi
|
||||
.ad
|
||||
.ft R
|
||||
@ -6022,7 +6022,7 @@ Example:
|
||||
.nf
|
||||
.na
|
||||
.ft C
|
||||
smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
|
||||
smtp_tls_session_cache_database = btree:/var/db/postfix/smtp_scache
|
||||
.fi
|
||||
.ad
|
||||
.ft R
|
||||
@ -8202,7 +8202,7 @@ Example:
|
||||
.nf
|
||||
.na
|
||||
.ft C
|
||||
smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
|
||||
smtpd_tls_session_cache_database = btree:/var/db/postfix/smtpd_scache
|
||||
.fi
|
||||
.ad
|
||||
.ft R
|
||||
|
||||
@ -91,7 +91,7 @@
|
||||
# .IP data_directory
|
||||
# The final destination directory for Postfix-writable data files such
|
||||
# as caches. This directory should not be shared with non-Postfix
|
||||
# software. The built-in default directory name is /var/lib/postfix.
|
||||
# software. The built-in default directory name is /var/db/postfix.
|
||||
# This parameter setting is recorded in the installed main.cf file.
|
||||
# .IP daemon_directory
|
||||
# The final destination directory for Postfix daemon programs. This
|
||||
|
||||
@ -301,7 +301,7 @@ in forged email. </p>
|
||||
|
||||
# Note 1: Be sure to read the "<a href="#caching">Caching</a>" section below!
|
||||
# Note 2: Avoid hash files here. Use btree instead.
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
|
||||
/etc/postfix/sender_access:
|
||||
aol.com reject_unverified_sender
|
||||
@ -346,7 +346,7 @@ you can see what mail would be blocked: </p>
|
||||
|
||||
# Note 1: Be sure to read the "<a href="#caching">Caching</a>" section below!
|
||||
# Note 2: Avoid hash files here. Use btree instead.
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
@ -424,7 +424,7 @@ stop". </p>
|
||||
<pre>
|
||||
/etc/postfix/main.cf:
|
||||
# Note: avoid hash files here. Use btree instead.
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
|
||||
@ -309,7 +309,7 @@ default</th> </tr>
|
||||
<td>/usr/libexec/postfix</td> </tr>
|
||||
|
||||
<tr> <td>DEF_DATA_DIR</td> <td>data_directory</td>
|
||||
<td>/var/lib/postfix</td> </tr>
|
||||
<td>/var/db/postfix</td> </tr>
|
||||
|
||||
<tr> <td>DEF_MAILQ_PATH</td> <td>mailq_path</td> <td>/usr/bin/mailq</td>
|
||||
</tr>
|
||||
|
||||
@ -639,7 +639,7 @@ the cost of repeatedly negotiating TLS session keys is high.</p>
|
||||
<blockquote>
|
||||
<pre>
|
||||
/etc/postfix/main.cf:
|
||||
smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
|
||||
smtpd_tls_session_cache_database = btree:/var/db/postfix/smtpd_scache
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
@ -1129,7 +1129,7 @@ is allowed to negotiate per unit time.</p>
|
||||
<blockquote>
|
||||
<pre>
|
||||
/etc/postfix/main.cf:
|
||||
smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
|
||||
smtp_tls_session_cache_database = btree:/var/db/postfix/smtp_scache
|
||||
</pre>
|
||||
</blockquote>
|
||||
|
||||
@ -2453,7 +2453,7 @@ This file is created when it does not exist. </p>
|
||||
<blockquote>
|
||||
<pre>
|
||||
/etc/postfix/main.cf:
|
||||
tls_random_exchange_name = /var/lib/postfix/prng_exch
|
||||
tls_random_exchange_name = /var/db/postfix/prng_exch
|
||||
tls_random_prng_update_period = 3600s
|
||||
</pre>
|
||||
</blockquote>
|
||||
@ -2598,14 +2598,14 @@ but don't require them from all clients. </p>
|
||||
/etc/postfix/main.cf:
|
||||
smtp_tls_CAfile = /etc/postfix/cacert.pem
|
||||
smtp_tls_session_cache_database =
|
||||
btree:/var/lib/postfix/smtp_tls_session_cache
|
||||
btree:/var/db/postfix/smtp_tls_session_cache
|
||||
smtp_tls_security_level = may
|
||||
smtpd_tls_CAfile = /etc/postfix/cacert.pem
|
||||
smtpd_tls_cert_file = /etc/postfix/foo-cert.pem
|
||||
smtpd_tls_key_file = /etc/postfix/foo-key.pem
|
||||
smtpd_tls_received_header = yes
|
||||
smtpd_tls_session_cache_database =
|
||||
btree:/var/lib/postfix/smtpd_tls_session_cache
|
||||
btree:/var/db/postfix/smtpd_tls_session_cache
|
||||
tls_random_source = dev:/dev/urandom
|
||||
# Postfix 2.3 and later
|
||||
smtpd_tls_security_level = may
|
||||
|
||||
@ -229,8 +229,8 @@ Examples:
|
||||
</p>
|
||||
|
||||
<pre>
|
||||
address_verify_map = hash:/var/lib/postfix/verify
|
||||
address_verify_map = btree:/var/lib/postfix/verify
|
||||
address_verify_map = hash:/var/db/postfix/verify
|
||||
address_verify_map = btree:/var/db/postfix/verify
|
||||
</pre>
|
||||
|
||||
<p>
|
||||
@ -8730,7 +8730,7 @@ data_directory, and a warning is logged. </p>
|
||||
<p> Example: </p>
|
||||
|
||||
<pre>
|
||||
smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
|
||||
smtpd_tls_session_cache_database = btree:/var/db/postfix/smtpd_scache
|
||||
</pre>
|
||||
|
||||
<p> This feature is available in Postfix 2.2 and later. </p>
|
||||
@ -9005,7 +9005,7 @@ data_directory, and a warning is logged. </p>
|
||||
<p> Example: </p>
|
||||
|
||||
<pre>
|
||||
smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
|
||||
smtp_tls_session_cache_database = btree:/var/db/postfix/smtp_scache
|
||||
</pre>
|
||||
|
||||
<p> This feature is available in Postfix 2.2 and later. </p>
|
||||
@ -11956,7 +11956,7 @@ passwords, and requires that Postfix is compiled with TLS support.
|
||||
<p> Example: </p>
|
||||
|
||||
<pre>
|
||||
smtp_sasl_auth_cache_name = proxy:btree:/var/lib/postfix/sasl_auth_cache
|
||||
smtp_sasl_auth_cache_name = proxy:btree:/var/db/postfix/sasl_auth_cache
|
||||
</pre>
|
||||
|
||||
<p> This feature is available in Postfix 2.5 and later. </p>
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
/* $NetBSD: cleanup.c,v 1.1.1.1 2009/06/23 10:08:43 tron Exp $ */
|
||||
/* $NetBSD: cleanup.c,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/* $NetBSD: cleanup.c,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/*++
|
||||
/* NAME
|
||||
@ -547,6 +549,7 @@ int main(int argc, char **argv)
|
||||
* Pass control to the single-threaded service skeleton.
|
||||
*/
|
||||
single_server_main(argc, argv, cleanup_service,
|
||||
MAIL_SERVER_BOOL_TABLE, cleanup_bool_table,
|
||||
MAIL_SERVER_INT_TABLE, cleanup_int_table,
|
||||
MAIL_SERVER_BOOL_TABLE, cleanup_bool_table,
|
||||
MAIL_SERVER_STR_TABLE, cleanup_str_table,
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
/* $NetBSD: cleanup.h,v 1.1.1.1 2009/06/23 10:08:43 tron Exp $ */
|
||||
/* $NetBSD: cleanup.h,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/* $NetBSD: cleanup.h,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/*++
|
||||
/* NAME
|
||||
@ -203,6 +205,7 @@ extern void cleanup_all(void);
|
||||
extern void cleanup_sig(int);
|
||||
extern void cleanup_pre_jail(char *, char **);
|
||||
extern void cleanup_post_jail(char *, char **);
|
||||
extern CONFIG_BOOL_TABLE cleanup_bool_table[];
|
||||
extern CONFIG_INT_TABLE cleanup_int_table[];
|
||||
extern CONFIG_BOOL_TABLE cleanup_bool_table[];
|
||||
extern CONFIG_STR_TABLE cleanup_str_table[];
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
/* $NetBSD: cleanup_envelope.c,v 1.1.1.1 2009/06/23 10:08:43 tron Exp $ */
|
||||
/* $NetBSD: cleanup_envelope.c,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/* $NetBSD: cleanup_envelope.c,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/*++
|
||||
/* NAME
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
/* $NetBSD: cleanup_init.c,v 1.1.1.1 2009/06/23 10:08:43 tron Exp $ */
|
||||
/* $NetBSD: cleanup_init.c,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/* $NetBSD: cleanup_init.c,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/*++
|
||||
/* NAME
|
||||
@ -8,6 +10,8 @@
|
||||
/* SYNOPSIS
|
||||
/* #include "cleanup.h"
|
||||
/*
|
||||
/* CONFIG_BOOL_TABLE cleanup_bool_table[];
|
||||
/*
|
||||
/* CONFIG_INT_TABLE cleanup_int_table[];
|
||||
/*
|
||||
/* CONFIG_BOOL_TABLE cleanup_bool_table[];
|
||||
@ -36,7 +40,7 @@
|
||||
/* for one-time initializations that must be done before any message
|
||||
/* processing can take place.
|
||||
/*
|
||||
/* cleanup_{int,str,time}_table[] specify configuration
|
||||
/* cleanup_{bool,int,str,time}_table[] specify configuration
|
||||
/* parameters that must be initialized before calling any functions
|
||||
/* in this module. These tables satisfy the interface as specified in
|
||||
/* single_service(3).
|
||||
@ -136,6 +140,7 @@ int var_delay_warn_time; /* delay that triggers warning */
|
||||
char *var_prop_extension; /* propagate unmatched extension */
|
||||
char *var_always_bcc; /* big brother */
|
||||
char *var_rcpt_witheld; /* recipients not disclosed */
|
||||
bool var_canon_env_rcpt; /* canonicalize envelope recipient */
|
||||
char *var_masq_classes; /* what to masquerade */
|
||||
int var_qattr_count_limit; /* named attribute limit */
|
||||
int var_virt_recur_limit; /* maximum virtual alias recursion */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: mail_params.h,v 1.1.1.1 2009/06/23 10:08:46 tron Exp $ */
|
||||
/* $NetBSD: mail_params.h,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
#ifndef _MAIL_PARAMS_H_INCLUDED_
|
||||
#define _MAIL_PARAMS_H_INCLUDED_
|
||||
@ -69,7 +69,7 @@ extern uid_t var_owner_uid;
|
||||
extern gid_t var_owner_gid;
|
||||
|
||||
#define VAR_SGID_GROUP "setgid_group"
|
||||
#define DEF_SGID_GROUP "postdrop"
|
||||
#define DEF_SGID_GROUP "maildrop"
|
||||
extern char *var_sgid_group;
|
||||
extern gid_t var_sgid_gid;
|
||||
|
||||
@ -267,7 +267,7 @@ extern char *var_pid_dir;
|
||||
*/
|
||||
#define VAR_DATA_DIR "data_directory"
|
||||
#ifndef DEF_DATA_DIR
|
||||
#define DEF_DATA_DIR "/var/lib/postfix"
|
||||
#define DEF_DATA_DIR "/var/db/postfix"
|
||||
#endif
|
||||
extern char *var_data_dir;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: smtpd.c,v 1.1.1.1 2009/06/23 10:08:55 tron Exp $ */
|
||||
/* $NetBSD: smtpd.c,v 1.2 2009/06/23 11:41:06 tron Exp $ */
|
||||
|
||||
/*++
|
||||
/* NAME
|
||||
@ -4698,6 +4698,7 @@ static void pre_jail_init(char *unused_name, char **unused_argv)
|
||||
VAR_SMTPD_SASL_ENABLE);
|
||||
#endif
|
||||
|
||||
#ifdef USE_TLS
|
||||
/*
|
||||
* XXX Temporary fix to pretend that we consistently implement TLS
|
||||
* security levels. We implement only a subset for now. If we implement
|
||||
@ -4732,6 +4733,9 @@ static void pre_jail_init(char *unused_name, char **unused_argv)
|
||||
}
|
||||
enforce_tls = var_smtpd_tls_wrappermode || var_smtpd_enforce_tls;
|
||||
use_tls = var_smtpd_use_tls || enforce_tls;
|
||||
#else
|
||||
enforce_tls = use_tls = 0;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Keys can only be loaded when running with suitable permissions. When
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: unix_recv_fd.c,v 1.1.1.1 2009/06/23 10:09:01 tron Exp $ */
|
||||
/* $NetBSD: unix_recv_fd.c,v 1.2 2009/06/23 11:41:07 tron Exp $ */
|
||||
|
||||
/*++
|
||||
/* NAME
|
||||
@ -76,7 +76,7 @@ int unix_recv_fd(int fd)
|
||||
|
||||
memset((char *) &msg, 0, sizeof(msg)); /* Fix 200512 */
|
||||
msg.msg_control = control_un.control;
|
||||
msg.msg_controllen = CMSG_LEN(sizeof(newfd)); /* Fix 200506 */
|
||||
msg.msg_controllen = sizeof(control_un.control); /* Fix 200506 */
|
||||
#else
|
||||
msg.msg_accrights = (char *) &newfd;
|
||||
msg.msg_accrightslen = sizeof(newfd);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: unix_send_fd.c,v 1.1.1.1 2009/06/23 10:09:01 tron Exp $ */
|
||||
/* $NetBSD: unix_send_fd.c,v 1.2 2009/06/23 11:41:07 tron Exp $ */
|
||||
|
||||
/*++
|
||||
/* NAME
|
||||
@ -78,7 +78,7 @@ int unix_send_fd(int fd, int sendfd)
|
||||
|
||||
memset((char *) &msg, 0, sizeof(msg)); /* Fix 200512 */
|
||||
msg.msg_control = control_un.control;
|
||||
msg.msg_controllen = CMSG_LEN(sizeof(sendfd)); /* Fix 200506 */
|
||||
msg.msg_controllen = sizeof(control_un.control); /* Fix 200506 */
|
||||
|
||||
cmptr = CMSG_FIRSTHDR(&msg);
|
||||
cmptr->cmsg_len = CMSG_LEN(sizeof(sendfd));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user