-TDICT_PCRE
-TDICT_REGEXP
-TDICT_REGEXP_RULE
+-TDICT_TCP
-TDICT_UNIX
-TDNS_FIXED
-TDNS_REPLY
-TPIPE_PARAMS
-TPLMYSQL
-TQMGR_ENTRY
+-TQMGR_JOB
-TQMGR_MESSAGE
+-TQMGR_PEER
-TQMGR_QUEUE
+-TQMGR_RCPT
-TQMGR_RCPT_LIST
-TQMGR_RECIPIENT
-TQMGR_SCAN
The MacOSX gcc compiler does not understand the new
printf_like/scanf_like attributes. File: util/sys_defs.h.
+
+20000922
+
+ nqmgr update from Patrik Rak for the changed queue manager
+ to delivery agent protocol.
+
+ Lame feature: syslog_facility parameter to control where
+ syslogd sends Postfix logging (default: syslog_facility =
+ mail). However, errors during command-line parsing are
+ still logged with the default syslog facility, as are errors
+ while processing the main.cf file (surprise). Based on
+ code by Andrew McNamara.
*- */*- */*/*- \
*.orig */*.orig */*/*.orig \
*.bak */*.bak */*/*.bak \
- *.make.err */*.make.err */*/*.make.err \
+ make.err */make.err */*/make.err \
conf/main.cf.default
find . -type s -print | xargs rm -f
find . -type d -print | xargs chmod 755
+Major changes with snapshot-20000923
+====================================
+
+The nqmgr (experimental smarter queue manager) has been updated.
+It no longer worked after the change in queue manager to delivery
+agent protocol.
+
+Specify "syslog_facility = log_local1" etc. to separate the logging
+from multiple Postfix instances. However, a non-default logging
+facility takes effect only after process initialization. Errors
+during command-line parsing are still logged with the default syslog
+facility, as are errors while processing the main.cf file.
+
Incompatible changes with snapshot-20000921
===========================================
After "make install" you need to execute "postfix reload". The
-protocol between queue manager and delivery agent protocol has
-changed. This does not affect the format of existing queue files.
-You just cannot mix this Postfix version's queue managers or delivery
-agents with older Postfix versions.
+protocol between queue manager and delivery agents has changed.
+This does not affect the format of existing queue files. You just
+cannot mix this Postfix version's queue managers or delivery agents
+with older Postfix versions.
The notation of [host:port] in transport tables etc. is going away
but it is still supported. The preferred form is now [host]:port.
#mydestination = $myhostname, localhost.$mydomain, $mydomain,
# mail.$mydomain, www.$mydomain, ftp.$mydomain
+# INTERNET OR INTRANET
+
+# The relayhost parameter specifies the default host to send mail to
+# when no entry is matched in the optional transport(5) table. When
+# no relayhost is given, mail is routed directly to the destination.
+#
+# On an intranet, specify the organizational domain name. If your
+# internal DNS uses no MX records, specify the name of the intranet
+# gateway host instead.
+#
+# Specify a domain, host, host:port, [host]:port, [address] or
+# [address]:port. Use the form [name] to turn off MX lookups. See
+# also the default_transport parameter if you're connected via UUCP.
+#
+# relayhost = $mydomain
+# relayhost = gateway.my.domain
+# relayhost = uucphost
+# relayhost = [an.ip.add.ress]
+
# REJECTING UNKNOWN LOCAL USERS
#
# The local_recipient_maps parameter specifies optional lookup tables
# relayhost = $mydomain
# relayhost = gateway.my.domain
# relayhost = uucphost
+# relayhost = [an.ip.add.ress]
relayhost =
# The relocated_maps parameter specifies optional tables with contact
#sun_mailtool_compatibility = yes
sun_mailtool_compatibility = no
+# The syslog_facility parameter controls where Postfix logging is
+# sent by the syslog daemon. Specify a logging facility as defined
+# in syslog.conf(5). The default logging facility is "mail".
+#
+# Beware: a non-default syslog_facility setting takes effect only
+# after process initialization. Some initialization errors will be
+# logged with the default facility, especially errors while parsing
+# the command line and errors while accessing the Postfix main.cf
+# configuration file.
+#
+syslog_facility = mail
+
# The trigger_timeout parameter limits the time to send a trigger to
# a Postfix daemon. This prevents programs from getting stuck when the
# mail system is under heavy load.
srctoman $? | nroff -man | man2html | postlink >$@
nqmgr.8.html: ../src/nqmgr/qmgr.c
- srctoman $? | sed -e 's/qmgr[^_]/n&/' -e 's/QMGR[^_]/N&/' | \
+ srctoman $? | sed -e 's/qmgr[^_]/n&/' \
+ -e 's/qmgr$$/n&/' \
+ -e 's/QMGR[^_]/N&/' | \
nroff -man | man2html | postlink >$@
pickup.8.html: ../src/pickup/pickup.c
<b>NAME</b>
- qmgr - Postfix queue manager
+ nqmgr - Postfix queue manager
<b>SYNOPSIS</b>
<b>nqmgr</b> [generic Postfix daemon options]
<b>Message</b> <b>scheduling</b>
<i>transport_</i><b>delivery</b><i>_</i><b>slot</b><i>_</i><b>cost</b> (valid range: 0,2,3...)
This parameter basically controls how often a mes-
- sage delivered by <i>transport</i> <b>can</b> <b>be</b> <b>preempted</b> <b>by</b>
- <b>another</b> <b>message.</b> <b>An</b> <b>internal</b> <b>per-message/transport</b>
- <b>counter</b> <b>is</b> <b>incremented</b> <b>by</b> <b>one</b> <b>for</b> <b>each</b> <i>trans-</i>
+ sage delivered by <i>transport</i> can be preempted by
+ another message. An internal per-message/transport
+ counter is incremented by one for each <i>trans-</i>
<i>port_</i><b>delivery</b><i>_</i><b>slot</b><i>_</i><b>cost</b> deliveries handled by
<i>transport</i>. This counter represents the number of
"available delivery slots" for use by other mes-
sages. Current message can be preempted by another
message when that other message can be delivered
- using less <i>tranpsort</i> agents than the value of the
+ using less <i>transport</i> agents than the value of the
"available delivery slots" counter.
Value equal to 0 disables the message preemption
P.O. Box 704
Yorktown Heights, NY 10598, USA
-
-
-
-
+ Scheduler enhancements:
+ Patrik Rak
+ Modra 6
+ 155 00, Prague, Czech Republic
postlog - Postfix-compatible logging utility
<b>SYNOPSIS</b>
- <b>postlog</b> [<b>-i</b>] [<b>-p</b> <i>priority</i><b>]</b> <b>[-t</b> <i>tag</i>] [<b>-v</b>] [<i>text...</i>]
+ <b>postlog</b> [<b>-iv</b>] [<b>-c</b> <i>config_dir</i>] [<b>-p</b> <i>priority</i><b>]</b> <b>[-t</b> <i>tag</i>]
+ [<i>text...</i>]
<b>DESCRIPTION</b>
- The <b>postlog</b> command implements a Postfix-compatible log-
+ The <b>postlog</b> command implements a Postfix-compatible log-
ging interface for use in, for example, shell scripts.
- By default, <b>postlog</b> logs the <i>text</i> given on the command
+ By default, <b>postlog</b> logs the <i>text</i> given on the command
line as one record. If no <i>text</i> is specified on the command
- line, <b>postlog</b> reads from standard input and logs each
+ line, <b>postlog</b> reads from standard input and logs each
input line as one record.
- Logging is sent to <b>syslogd</b>(8); when the standard error
- stream is connected to a terminal, logging is sent there
+ Logging is sent to <b>syslogd</b>(8); when the standard error
+ stream is connected to a terminal, logging is sent there
as well.
The following options are implemented:
+ <b>-c</b> <i>config_dir</i>
+ Read the <b>main.cf</b> configuration file in the named
+ directory instead of the default configuration
+ directory.
+
<b>-i</b> Include the process ID in the logging tag.
<b>-p</b> <i>priority</i>
- Specifies the logging severity: <b>info</b> (default),
+ Specifies the logging severity: <b>info</b> (default),
<b>warn</b>, <b>error</b>, <b>fatal</b>, or <b>panic</b>.
<b>-t</b> <i>tag</i> Specifies the logging tag, that is, the identifying
- name that appears at the beginning of each logging
+ name that appears at the beginning of each logging
record.
<b>-v</b> Enable verbose logging for debugging purposes. Mul-
- tiple <b>-v</b> options make the software increasingly
+ tiple <b>-v</b> options make the software increasingly
verbose.
<b>SEE</b> <b>ALSO</b>
syslogd(8) syslog daemon.
<b>LICENSE</b>
- The Secure Mailer license must be distributed with this
+ The Secure Mailer license must be distributed with this
software.
<b>AUTHOR(S)</b>
-
-
-
-
-
-
1
man8/nqmgr.8: ../src/nqmgr/qmgr.c
../mantools/srctoman $? | \
- sed -e 's/qmgr[^_]/n&/' -e 's/QMGR[^_]/N&/' >$@
+ sed -e 's/qmgr[^_]/n&/' \
+ -e 's/qmgr$$/n&/' \
+ -e 's/QMGR[^_]/N&/' >$@
man8/pickup.8: ../src/pickup/pickup.c
../mantools/srctoman $? >$@
.na
.nf
.fi
-\fBpostlog\fR [\fB-i\fR] [\fB-p \fIpriority\fB] [\fB-t \fItag\fR]
-[\fB-v\fR] [\fItext...\fR]
+\fBpostlog\fR [\fB-iv\fR] [\fB-c \fIconfig_dir\fR]
+[\fB-p \fIpriority\fB] [\fB-t \fItag\fR] [\fItext...\fR]
.SH DESCRIPTION
.ad
.fi
is connected to a terminal, logging is sent there as well.
The following options are implemented:
+.IP "\fB-c \fIconfig_dir\fR"
+Read the \fBmain.cf\fR configuration file in the named directory
+instead of the default configuration directory.
.IP \fB-i\fR
Include the process ID in the logging tag.
.IP "\fB-p \fIpriority\fR"
.ad
.fi
.SH NAME
-qmgr
+nqmgr
\-
Postfix queue manager
.SH SYNOPSIS
.fi
.IP "\fItransport\fB_delivery_slot_cost\fR (valid range: 0,2,3...)
This parameter basically controls how often a message
-delivered by \fItransport\fB can be preempted by another
+delivered by \fItransport\fR can be preempted by another
message.
An internal per-message/transport counter is incremented by one
for each \fItransport\fB_delivery_slot_cost\fR
deliveries handled by \fItransport\fR. This counter represents
the number of "available delivery slots" for use by other messages.
Current message can be preempted by another message when that
-other message can be delivered using less \fItranpsort\fR agents
+other message can be delivered using less \fItransport\fR agents
than the value of the "available delivery slots" counter.
.sp
Value equal to 0 disables the message preemption for \fItransport\fR.
IBM T.J. Watson Research
P.O. Box 704
Yorktown Heights, NY 10598, USA
+
+Scheduler enhancements:
+Patrik Rak
+Modra 6
+155 00, Prague, Czech Republic
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
mail_params.o: mail_params.c
mail_params.o: ../../include/sys_defs.h
mail_params.o: ../../include/msg.h
+mail_params.o: ../../include/msg_syslog.h
mail_params.o: ../../include/get_hostname.h
mail_params.o: ../../include/valid_hostname.h
mail_params.o: ../../include/stringops.h
/* time_t var_starttime;
/* int var_ownreq_special;
/* int var_daemon_timeout;
+/* char *var_syslog_facility;
/*
/* void mail_params_init()
/* DESCRIPTION
/* Utility library. */
#include <msg.h>
+#include <msg_syslog.h>
#include <get_hostname.h>
#include <valid_hostname.h>
#include <stringops.h>
time_t var_starttime;
int var_ownreq_special;
int var_daemon_timeout;
+char *var_syslog_facility;
/* check_myhostname - lookup hostname and validate */
void mail_params_init()
{
+ static CONFIG_STR_TABLE first_str_defaults[] = {
+ VAR_SYSLOG_FACILITY, DEF_SYSLOG_FACILITY, &var_syslog_facility, 1, 0,
+ 0,
+ };
static CONFIG_STR_FN_TABLE function_str_defaults[] = {
VAR_MYHOSTNAME, check_myhostname, &var_myhostname, 1, 0,
VAR_MYDOMAIN, check_mydomainname, &var_mydomain, 1, 0,
0,
};
+ /*
+ * Extract syslog_facility early, so that from here on all errors are
+ * logged with the proper facility.
+ */
+ get_mail_conf_str_table(first_str_defaults);
+
+ if (!msg_syslog_facility(var_syslog_facility))
+ msg_fatal("unknown %s configuration parameter value: %s",
+ VAR_SYSLOG_FACILITY, var_syslog_facility);
+
/*
* Variables whose defaults are determined at runtime. Some sites use
* short hostnames in the host table; some sites name their system after
#define DEF_MAIL_NAME "Postfix"
extern char *var_mail_name;
- /*
- * Logging facility. Configurable so you can distinguish a limited number of
- * Postfix instances.
- */
-#define VAR_LOG_FACILITY "logging_facility"
-#define DEF_LOG_FACILITY "mail"
-extern char *var_log_facility;
-
/*
* What problem classes should be reported to the postmaster via email.
* Default is bad problems only. See mail_error(3). Even when mail notices
extern char *var_db_type;
/*
- * Logging. Changing facility at run-time does not do much good, because
- * something may have to be logged before parameters are read from file.
+ * What syslog facility to use. Unfortunately, something may have to be
+ * logged before parameters are read from the main.cf file. This logging
+ * will go the LOG_FACILITY facility specified below.
*/
+#define VAR_SYSLOG_FACILITY "syslog_facility"
+extern char *var_syslog_facility;
+
+#ifndef DEF_SYSLOG_FACILITY
+#define DEF_SYSLOG_FACILITY "mail"
+#endif
+
#ifndef LOG_FACILITY
#define LOG_FACILITY LOG_MAIL
#endif
* Version of this program.
*/
#define VAR_MAIL_VERSION "mail_version"
-#define DEF_MAIL_VERSION "Snapshot-20000922"
+#define DEF_MAIL_VERSION "Snapshot-20000923"
extern char *var_mail_version;
/* LICENSE
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
recipient.o: ../../include/dict.h
recipient.o: ../../include/vstream.h
recipient.o: ../../include/argv.h
+recipient.o: ../../include/stat_as.h
recipient.o: ../../include/bounce.h
+recipient.o: ../../include/defer.h
recipient.o: ../../include/mail_params.h
recipient.o: ../../include/split_addr.h
recipient.o: ../../include/ext_prop.h
+recipient.o: ../../include/mypwd.h
recipient.o: local.h
recipient.o: ../../include/been_here.h
recipient.o: ../../include/tok822.h
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_JOB
--TQMGR_MESSAGE
--TQMGR_PEER
--TQMGR_QUEUE
--TQMGR_RCPT
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
qmgr_deliver.o: ../../include/mail_proto.h
qmgr_deliver.o: ../../include/recipient_list.h
qmgr_deliver.o: ../../include/mail_params.h
+qmgr_deliver.o: ../../include/deliver_request.h
qmgr_deliver.o: qmgr.h
qmgr_deliver.o: ../../include/scan_dir.h
qmgr_deliver.o: ../../include/maps.h
qmgr_entry.o: ../../include/maps.h
qmgr_entry.o: ../../include/dict.h
qmgr_entry.o: ../../include/argv.h
+qmgr_job.o: qmgr_job.c
+qmgr_job.o: ../../include/sys_defs.h
+qmgr_job.o: ../../include/msg.h
+qmgr_job.o: ../../include/events.h
+qmgr_job.o: ../../include/htable.h
+qmgr_job.o: ../../include/mymalloc.h
+qmgr_job.o: qmgr.h
+qmgr_job.o: ../../include/vstream.h
+qmgr_job.o: ../../include/vbuf.h
+qmgr_job.o: ../../include/scan_dir.h
+qmgr_job.o: ../../include/maps.h
+qmgr_job.o: ../../include/dict.h
+qmgr_job.o: ../../include/argv.h
qmgr_message.o: qmgr_message.c
qmgr_message.o: ../../include/sys_defs.h
qmgr_message.o: ../../include/msg.h
+qmgr_message.o: ../../include/events.h
qmgr_message.o: ../../include/mymalloc.h
qmgr_message.o: ../../include/vstring.h
qmgr_message.o: ../../include/vbuf.h
qmgr_move.o: ../../include/maps.h
qmgr_move.o: ../../include/dict.h
qmgr_move.o: ../../include/argv.h
+qmgr_peer.o: qmgr_peer.c
+qmgr_peer.o: ../../include/sys_defs.h
+qmgr_peer.o: ../../include/msg.h
+qmgr_peer.o: ../../include/htable.h
+qmgr_peer.o: ../../include/mymalloc.h
+qmgr_peer.o: qmgr.h
+qmgr_peer.o: ../../include/vstream.h
+qmgr_peer.o: ../../include/vbuf.h
+qmgr_peer.o: ../../include/scan_dir.h
+qmgr_peer.o: ../../include/maps.h
+qmgr_peer.o: ../../include/dict.h
+qmgr_peer.o: ../../include/argv.h
qmgr_queue.o: qmgr_queue.c
qmgr_queue.o: ../../include/sys_defs.h
qmgr_queue.o: ../../include/msg.h
/* .fi
/* .IP "\fItransport\fB_delivery_slot_cost\fR (valid range: 0,2,3...)
/* This parameter basically controls how often a message
-/* delivered by \fItransport\fB can be preempted by another
+/* delivered by \fItransport\fR can be preempted by another
/* message.
/* An internal per-message/transport counter is incremented by one
/* for each \fItransport\fB_delivery_slot_cost\fR
/* deliveries handled by \fItransport\fR. This counter represents
/* the number of "available delivery slots" for use by other messages.
/* Current message can be preempted by another message when that
-/* other message can be delivered using less \fItranpsort\fR agents
+/* other message can be delivered using less \fItransport\fR agents
/* than the value of the "available delivery slots" counter.
/* .sp
/* Value equal to 0 disables the message preemption for \fItransport\fR.
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
int rcpt_per_stack; /* extra slots reserved for jobs on
* the job stack */
int rcpt_unused; /* available in-core recipient slots */
- int slot_cost; /* cost of new preemption slot (#
+ int slot_cost; /* cost of new preemption slot (# of
* selected entries) */
- int slot_loan; /* preemption boost offset and
- * factor, see */
- int slot_loan_factor; /* qmgr_job_preempt() for more info */
+ int slot_loan; /* preemption boost offset and */
+ int slot_loan_factor; /* factor, see qmgr_job_preempt() */
int min_slots; /* when preemption can take effect at
* all */
struct HTABLE *queue_byname; /* queues indexed by domain */
char *sender; /* complete address */
char *errors_to; /* error report address */
char *return_receipt; /* confirm receipt address */
- char *filter_xport; /* inspection transport */
+ char *filter_xport; /* filtering transport */
+ char *inspect_xport; /* inspecting transport */
long data_size; /* message content size */
long rcpt_offset; /* more recipients here */
long unread_offset; /* more unread recipients here */
QMGR_JOB_LIST message_peers; /* per message neighbor linkage */
QMGR_JOB_LIST transport_peers; /* per transport neighbor linkage */
QMGR_JOB_LIST stack_peers; /* transport stack linkage */
- int stack_level; /* job stack nesting level (-1 ->
+ int stack_level; /* job stack nesting level (-1 means
* retired) */
struct HTABLE *peer_byname; /* message job peers, indexed by
* domain */
QMGR_PEER_LIST peer_list; /* list of message job peers */
int slots_used; /* slots used during preemption */
- int slots_available; /* slots available for preemption (*
- * slot_cost) */
+ int slots_available; /* slots available for preemption (in
+ * multiples of slot_cost) */
int selected_entries; /* # of entries selected for delivery
* so far */
int read_entries; /* # of entries read in-core so far */
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
#include <mail_proto.h>
#include <recipient_list.h>
#include <mail_params.h>
+#include <deliver_request.h>
/* Application-specific. */
QMGR_RCPT *recipient;
QMGR_MESSAGE *message = entry->message;
- mail_print(stream, "%s %s %ld %ld %s %s %s %s %ld",
+ mail_print(stream, "%d %s %s %ld %ld %s %s %s %s %ld",
+ message->inspect_xport ? DEL_REQ_FLAG_BOUNCE : DEL_REQ_FLAG_DEFLT,
message->queue_name, message->queue_id,
message->data_offset, message->data_size,
entry->queue->name, message->sender,
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
#include <sys_defs.h>
#include <sys/stat.h>
#include <stdlib.h>
+#include <stdio.h> /* sscanf() */
#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
-#include <stdio.h> /* sscanf() */
#ifdef STRCASECMP_IN_STRINGS_H
#include <strings.h>
message->errors_to = 0;
message->return_receipt = 0;
message->filter_xport = 0;
+ message->inspect_xport = 0;
message->data_size = 0;
message->warn_offset = 0;
message->warn_time = 0;
} else if (rec_type == REC_TYPE_FILT) {
if (message->filter_xport == 0)
message->filter_xport = mystrdup(start);
+ } else if (rec_type == REC_TYPE_INSP) {
+ if (message->inspect_xport == 0)
+ message->inspect_xport = mystrdup(start);
} else if (rec_type == REC_TYPE_FROM) {
if (message->sender == 0) {
message->sender = mystrdup(start);
myfree(message->return_receipt);
if (message->filter_xport)
myfree(message->filter_xport);
+ if (message->inspect_xport)
+ myfree(message->inspect_xport);
qmgr_rcpt_list_free(&message->rcpt_list);
qmgr_message_count--;
myfree((char *) message);
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
+/*
+/* Scheduler enhancements:
+/* Patrik Rak
+/* Modra 6
+/* 155 00, Prague, Czech Republic
/*--*/
/* System library. */
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
pipe.o: ../../include/mail_addr.h
pipe.o: ../../include/canon_addr.h
pipe.o: ../../include/split_addr.h
+pipe.o: ../../include/off_cvt.h
pipe.o: ../../include/mail_server.h
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
postlog.o: ../../include/msg_vstream.h
postlog.o: ../../include/msg_syslog.h
postlog.o: ../../include/mail_params.h
+postlog.o: ../../include/mail_conf.h
/* Postfix-compatible logging utility
/* SYNOPSIS
/* .fi
-/* \fBpostlog\fR [\fB-i\fR] [\fB-p \fIpriority\fB] [\fB-t \fItag\fR]
-/* [\fB-v\fR] [\fItext...\fR]
+/* \fBpostlog\fR [\fB-iv\fR] [\fB-c \fIconfig_dir\fR]
+/* [\fB-p \fIpriority\fB] [\fB-t \fItag\fR] [\fItext...\fR]
/* DESCRIPTION
/* The \fBpostlog\fR command implements a Postfix-compatible logging
/* interface for use in, for example, shell scripts.
/* is connected to a terminal, logging is sent there as well.
/*
/* The following options are implemented:
+/* .IP "\fB-c \fIconfig_dir\fR"
+/* Read the \fBmain.cf\fR configuration file in the named directory
+/* instead of the default configuration directory.
/* .IP \fB-i\fR
/* Include the process ID in the logging tag.
/* .IP "\fB-p \fIpriority\fR"
/* Global library. */
#include <mail_params.h> /* XXX right place for LOG_FACILITY? */
+#include <mail_conf.h>
/* Application-specific. */
while ((ch = GETOPT(argc, argv, "c:ip:t:v")) > 0) {
switch (ch) {
default:
- msg_fatal("usage: %s [-i] [-p priority] [-t tag] [-v] text", tag);
+ msg_fatal("usage: %s [-c config_dir] [-i] [-p priority] [-t tag] [-v] [text]", tag);
+ break;
+ case 'c':
+ if (setenv(CONF_ENV_PATH, optarg, 1) < 0)
+ msg_fatal("out of memory");
break;
case 'i':
log_flags |= LOG_PID;
msg_vstream_init(tag, VSTREAM_ERR);
msg_syslog_init(tag, log_flags, LOG_FACILITY);
+ /*
+ * Process the main.cf file. This overrides any logging facility that was
+ * specified with msg_syslog_init();
+ */
+ mail_conf_read();
+
/*
* Log the command line or log lines from standard input.
*/
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
smtpd.o: ../../include/valid_hostname.h
smtpd.o: ../../include/dict.h
smtpd.o: ../../include/argv.h
+smtpd.o: ../../include/watchdog.h
smtpd.o: ../../include/mail_params.h
smtpd.o: ../../include/record.h
smtpd.o: ../../include/rec_type.h
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
+++ /dev/null
--TALIAS_TOKEN
--TARGV
--TBH_TABLE
--TBINATTR
--TBINATTR_INFO
--TBINHASH
--TBINHASH_INFO
--TBOUNCE_STAT
--TCLEANUP_STATE
--TCLIENT_LIST
--TCLNT_STREAM
--TCONFIG_BOOL_FN_TABLE
--TCONFIG_BOOL_TABLE
--TCONFIG_INT_FN_TABLE
--TCONFIG_INT_TABLE
--TCONFIG_STR_FN_TABLE
--TCONFIG_STR_TABLE
--TDELIVER_ATTR
--TDELIVER_REQUEST
--TDICT
--TDICT_DB
--TDICT_DBM
--TDICT_ENV
--TDICT_HT
--TDICT_LDAP
--TDICT_MYSQL
--TDICT_NI
--TDICT_NIS
--TDICT_NISPLUS
--TDICT_NODE
--TDICT_OPEN_INFO
--TDICT_PCRE
--TDICT_REGEXP
--TDICT_REGEXP_RULE
--TDICT_TCP
--TDICT_UNIX
--TDNS_FIXED
--TDNS_REPLY
--TDNS_RR
--TDOMAIN_LIST
--TEXPAND_ATTR
--TFILE
--TFORWARD_INFO
--THEADER_OPTS
--THOST
--THTABLE
--THTABLE_INFO
--TINET_ADDR_LIST
--TINT_TABLE
--TJMP_BUF_WRAPPER
--TLMTP_ATTR
--TLMTP_RESP
--TLMTP_SESSION
--TLMTP_STATE
--TLOCAL_EXP
--TLOCAL_STATE
--TMAC_EXP
--TMAC_HEAD
--TMAC_PARSE
--TMAIL_PRINT
--TMAIL_SCAN
--TMAPS
--TMASTER_PROC
--TMASTER_SERV
--TMASTER_STATUS
--TMBLOCK
--TMKMAP
--TMKMAP_OPEN_INFO
--TMULTI_SERVER
--TMVECT
--TMYSQL_NAME
--TNAMADR_LIST
--TNAME_MASK
--TPEER_NAME
--TPICKUP_INFO
--TPIPE_ATTR
--TPIPE_PARAMS
--TPLMYSQL
--TQMGR_ENTRY
--TQMGR_MESSAGE
--TQMGR_QUEUE
--TQMGR_RCPT_LIST
--TQMGR_RECIPIENT
--TQMGR_SCAN
--TQMGR_TRANSPORT
--TRECIPIENT
--TRECIPIENT_LIST
--TREC_TYPE_NAME
--TRESOLVE_REPLY
--TRESPONSE
--TSCAN_DIR
--TSCAN_INFO
--TSCAN_OBJ
--TSESSION
--TSINGLE_SERVER
--TSINK_COMMAND
--TSINK_STATE
--TSMTPD_CMD
--TSMTPD_STATE
--TSMTPD_TOKEN
--TSMTP_ADDR
--TSMTP_CMD
--TSMTP_RESP
--TSMTP_SESSION
--TSMTP_STATE
--TSOCKADDR_SIZE
--TSPAWN_ATTR
--TSTRING_TABLE
--TSYS_EXITS_TABLE
--TTOK822
--TTRIGGER_SERVER
--TUSER_ATTR
--TVBUF
--TVSTREAM
--TVSTREAM_POPEN_ARGS
--TVSTRING
--TWAIT_STATUS_T
--TWATCHDOG
--TWATCH_FD
--Tsasl_conn_t
--Tsasl_secret_t
--- /dev/null
+../../.indent.pro
\ No newline at end of file
/* const char *progname;
/* int log_opt;
/* int facility;
+/*
+/* int msg_syslog_facility(facility_name)
+/* const char *facility_name;
/* DESCRIPTION
/* This module implements support to report msg(3) diagnostics
/* via the syslog daemon.
/*
/* msg_syslog_init() is a wrapper around the openlog(3) routine
/* that directs subsequent msg(3) output to the syslog daemon.
+/*
+/* msg_syslog_facility() is a helper routine that overrides the
+/* logging facility that is specified with msg_syslog_init().
+/* The result is zero in case of an unknown facility name.
/* SEE ALSO
/* syslog(3) syslog library
/* msg(3) diagnostics module
/* System libraries. */
#include <sys_defs.h>
-#include <stdlib.h> /* 44BSD stdarg.h uses abort() */
+#include <stdlib.h> /* 44BSD stdarg.h uses abort() */
#include <stdarg.h>
#include <errno.h>
#include <syslog.h>
#include "msg_syslog.h"
/*
- * Stay a little below the 2048-byte limit of older syslog() implementations.
+ * Stay a little below the 2048-byte limit of older syslog()
+ * implementations.
*/
#define MSG_SYSLOG_RECLEN 2000
+struct facility_list {
+ char *name;
+ int facility;
+};
+
+static struct facility_list facility_list[] = {
+#ifdef LOG_AUTH
+ "auth", LOG_AUTH,
+#endif
+#ifdef LOG_AUTHPRIV
+ "authpriv", LOG_AUTHPRIV,
+#endif
+#ifdef LOG_CRON
+ "cron", LOG_CRON,
+#endif
+#ifdef LOG_DAEMON
+ "daemon", LOG_DAEMON,
+#endif
+#ifdef LOG_FTP
+ "ftp", LOG_FTP,
+#endif
+#ifdef LOG_KERN
+ "kern", LOG_KERN,
+#endif
+#ifdef LOG_LPR
+ "lpr", LOG_LPR,
+#endif
+#ifdef LOG_MAIL
+ "mail", LOG_MAIL,
+#endif
+#ifdef LOG_NEWS
+ "news", LOG_NEWS,
+#endif
+#ifdef LOG_SECURITY
+ "security", LOG_SECURITY,
+#endif
+#ifdef LOG_SYSLOG
+ "syslog", LOG_SYSLOG,
+#endif
+#ifdef LOG_USER
+ "user", LOG_USER,
+#endif
+#ifdef LOG_UUCP
+ "uucp", LOG_UUCP,
+#endif
+#ifdef LOG_LOCAL0
+ "local0", LOG_LOCAL0,
+#endif
+#ifdef LOG_LOCAL1
+ "local1", LOG_LOCAL1,
+#endif
+#ifdef LOG_LOCAL2
+ "local2", LOG_LOCAL2,
+#endif
+#ifdef LOG_LOCAL3
+ "local3", LOG_LOCAL3,
+#endif
+#ifdef LOG_LOCAL4
+ "local4", LOG_LOCAL4,
+#endif
+#ifdef LOG_LOCAL5
+ "local5", LOG_LOCAL5,
+#endif
+#ifdef LOG_LOCAL6
+ "local6", LOG_LOCAL6,
+#endif
+#ifdef LOG_LOCAL7
+ "local7", LOG_LOCAL7,
+#endif
+ 0,
+};
+
+static int syslog_facility;
+
/* msg_syslog_print - log info to syslog daemon */
static void msg_syslog_print(int level, const char *text)
msg_panic("msg_syslog_print: invalid severity level: %d", level);
if (level == MSG_INFO) {
- syslog(log_level[level], "%.*s", MSG_SYSLOG_RECLEN, text);
+ syslog(syslog_facility | log_level[level], "%.*s",
+ MSG_SYSLOG_RECLEN, text);
} else {
- syslog(log_level[level], "%s: %.*s",
+ syslog(syslog_facility | log_level[level], "%s: %.*s",
severity_name[level], MSG_SYSLOG_RECLEN, text);
}
}
}
}
+/* msg_syslog_facility - set logging facility by name */
+
+int msg_syslog_facility(const char *facility_name)
+{
+ struct facility_list *fnp;
+
+ for (fnp = facility_list; fnp->name; ++fnp) {
+ if (!strcmp(fnp->name, facility_name)) {
+ syslog_facility = fnp->facility;
+ return (1);
+ }
+ }
+ return 0;
+}
+
#ifdef TEST
/*
* External interface.
*/
extern void msg_syslog_init(const char *, int, int);
+extern int msg_syslog_facility(const char *);
/* LICENSE
/* .ad
projects / thirdparty / postfix.git / commitdiff
