From: Wietse Venema Date: Sat, 23 Sep 2000 00:00:00 +0000 (+0000) Subject: snapshot-20000923 X-Git-Tag: v20010228~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ddc760354318d500cac27db39f11560684f7716;p=thirdparty%2Fpostfix.git snapshot-20000923 --- diff --git a/postfix/.indent.pro b/postfix/.indent.pro index 5fbb816df..005b2559e 100644 --- a/postfix/.indent.pro +++ b/postfix/.indent.pro @@ -32,6 +32,7 @@ -TDICT_PCRE -TDICT_REGEXP -TDICT_REGEXP_RULE +-TDICT_TCP -TDICT_UNIX -TDNS_FIXED -TDNS_REPLY @@ -76,8 +77,11 @@ -TPIPE_PARAMS -TPLMYSQL -TQMGR_ENTRY +-TQMGR_JOB -TQMGR_MESSAGE +-TQMGR_PEER -TQMGR_QUEUE +-TQMGR_RCPT -TQMGR_RCPT_LIST -TQMGR_RECIPIENT -TQMGR_SCAN diff --git a/postfix/HISTORY b/postfix/HISTORY index a5443e487..e328ae595 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -4258,3 +4258,15 @@ Apologies for any names omitted. 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. diff --git a/postfix/Makefile.in b/postfix/Makefile.in index a24a91b3a..fcc8c66e6 100644 --- a/postfix/Makefile.in +++ b/postfix/Makefile.in @@ -60,7 +60,7 @@ tidy: clean *- */*- */*/*- \ *.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 diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 328ac5ed0..746938cfe 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -1,11 +1,24 @@ +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. diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf index 6763727fc..ee4eed63e 100644 --- a/postfix/conf/main.cf +++ b/postfix/conf/main.cf @@ -112,6 +112,25 @@ mail_owner = postfix #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 diff --git a/postfix/conf/sample-misc.cf b/postfix/conf/sample-misc.cf index f2b5ff4a0..e5b134b36 100644 --- a/postfix/conf/sample-misc.cf +++ b/postfix/conf/sample-misc.cf @@ -252,6 +252,7 @@ recipient_delimiter = # relayhost = $mydomain # relayhost = gateway.my.domain # relayhost = uucphost +# relayhost = [an.ip.add.ress] relayhost = # The relocated_maps parameter specifies optional tables with contact @@ -275,6 +276,18 @@ relocated_maps = #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. diff --git a/postfix/html/Makefile.in b/postfix/html/Makefile.in index 081e5c24e..4431a1bf9 100644 --- a/postfix/html/Makefile.in +++ b/postfix/html/Makefile.in @@ -49,7 +49,9 @@ master.8.html: ../src/master/master.c 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 diff --git a/postfix/html/nqmgr.8.html b/postfix/html/nqmgr.8.html index 4a96531e2..624352aa2 100644 --- a/postfix/html/nqmgr.8.html +++ b/postfix/html/nqmgr.8.html @@ -6,7 +6,7 @@ NQMGR(8) NQMGR(8) NAME - qmgr - Postfix queue manager + nqmgr - Postfix queue manager SYNOPSIS nqmgr [generic Postfix daemon options] @@ -338,15 +338,15 @@ NQMGR(8) NQMGR(8) Message scheduling transport_delivery_slot_cost (valid range: 0,2,3...) This parameter basically controls how often a mes- - sage delivered by transport can be preempted by - another message. An internal per-message/transport - counter is incremented by one for each trans- + sage delivered by transport can be preempted by + another message. An internal per-message/transport + counter is incremented by one for each trans- port_delivery_slot_cost deliveries handled by transport. 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 tranpsort agents than the value of the + using less transport agents than the value of the "available delivery slots" counter. Value equal to 0 disables the message preemption @@ -409,10 +409,10 @@ NQMGR(8) NQMGR(8) P.O. Box 704 Yorktown Heights, NY 10598, USA - - - - + Scheduler enhancements: + Patrik Rak + Modra 6 + 155 00, Prague, Czech Republic diff --git a/postfix/html/postlog.1.html b/postfix/html/postlog.1.html index e6464549a..c6d6247a8 100644 --- a/postfix/html/postlog.1.html +++ b/postfix/html/postlog.1.html @@ -9,42 +9,48 @@ POSTLOG(1) POSTLOG(1) postlog - Postfix-compatible logging utility SYNOPSIS - postlog [-i] [-p priority] [-t tag] [-v] [text...] + postlog [-iv] [-c config_dir] [-p priority] [-t tag] + [text...] DESCRIPTION - The postlog command implements a Postfix-compatible log- + The postlog command implements a Postfix-compatible log- ging interface for use in, for example, shell scripts. - By default, postlog logs the text given on the command + By default, postlog logs the text given on the command line as one record. If no text is specified on the command - line, postlog reads from standard input and logs each + line, postlog reads from standard input and logs each input line as one record. - Logging is sent to syslogd(8); when the standard error - stream is connected to a terminal, logging is sent there + Logging is sent to syslogd(8); when the standard error + stream is connected to a terminal, logging is sent there as well. The following options are implemented: + -c config_dir + Read the main.cf configuration file in the named + directory instead of the default configuration + directory. + -i Include the process ID in the logging tag. -p priority - Specifies the logging severity: info (default), + Specifies the logging severity: info (default), warn, error, fatal, or panic. -t tag 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. -v Enable verbose logging for debugging purposes. Mul- - tiple -v options make the software increasingly + tiple -v options make the software increasingly verbose. SEE ALSO syslogd(8) syslog daemon. LICENSE - The Secure Mailer license must be distributed with this + The Secure Mailer license must be distributed with this software. AUTHOR(S) @@ -56,12 +62,6 @@ POSTLOG(1) POSTLOG(1) - - - - - - 1 diff --git a/postfix/man/Makefile.in b/postfix/man/Makefile.in index 20d23b556..b66cb3de3 100644 --- a/postfix/man/Makefile.in +++ b/postfix/man/Makefile.in @@ -49,7 +49,9 @@ man8/master.8: ../src/master/master.c 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 $? >$@ diff --git a/postfix/man/man1/postlog.1 b/postfix/man/man1/postlog.1 index 7a7bbb6e3..1070ec35a 100644 --- a/postfix/man/man1/postlog.1 +++ b/postfix/man/man1/postlog.1 @@ -9,8 +9,8 @@ Postfix-compatible logging utility .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 @@ -26,6 +26,9 @@ Logging is sent to \fBsyslogd\fR(8); when the standard error stream 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" diff --git a/postfix/man/man8/nqmgr.8 b/postfix/man/man8/nqmgr.8 index e66ad522a..4a36d1df5 100644 --- a/postfix/man/man8/nqmgr.8 +++ b/postfix/man/man8/nqmgr.8 @@ -2,7 +2,7 @@ .ad .fi .SH NAME -qmgr +nqmgr \- Postfix queue manager .SH SYNOPSIS @@ -251,14 +251,14 @@ named message \fItransport\fR. .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. @@ -300,3 +300,8 @@ Wietse Venema 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 diff --git a/postfix/src/base64/.indent.pro b/postfix/src/base64/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/base64/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/base64/.indent.pro b/postfix/src/base64/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/base64/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/bounce/.indent.pro b/postfix/src/bounce/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/bounce/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/bounce/.indent.pro b/postfix/src/bounce/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/bounce/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/cleanup/.indent.pro b/postfix/src/cleanup/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/cleanup/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/cleanup/.indent.pro b/postfix/src/cleanup/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/cleanup/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/dns/.indent.pro b/postfix/src/dns/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/dns/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/dns/.indent.pro b/postfix/src/dns/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/dns/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/error/.indent.pro b/postfix/src/error/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/error/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/error/.indent.pro b/postfix/src/error/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/error/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/fsstone/.indent.pro b/postfix/src/fsstone/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/fsstone/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/fsstone/.indent.pro b/postfix/src/fsstone/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/fsstone/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/global/.indent.pro b/postfix/src/global/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/global/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/global/.indent.pro b/postfix/src/global/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/global/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/global/Makefile.in b/postfix/src/global/Makefile.in index 9282db9a2..9d522c7c5 100644 --- a/postfix/src/global/Makefile.in +++ b/postfix/src/global/Makefile.in @@ -544,6 +544,7 @@ mail_open_ok.o: mail_open_ok.h 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 diff --git a/postfix/src/global/mail_params.c b/postfix/src/global/mail_params.c index 6a0c55456..bc21ed347 100644 --- a/postfix/src/global/mail_params.c +++ b/postfix/src/global/mail_params.c @@ -57,6 +57,7 @@ /* time_t var_starttime; /* int var_ownreq_special; /* int var_daemon_timeout; +/* char *var_syslog_facility; /* /* void mail_params_init() /* DESCRIPTION @@ -96,6 +97,7 @@ /* Utility library. */ #include +#include #include #include #include @@ -161,6 +163,7 @@ int var_soft_bounce; time_t var_starttime; int var_ownreq_special; int var_daemon_timeout; +char *var_syslog_facility; /* check_myhostname - lookup hostname and validate */ @@ -243,6 +246,10 @@ static void check_mail_owner(void) 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, @@ -299,6 +306,16 @@ void mail_params_init() 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 diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h index 8d222120b..6902977b5 100644 --- a/postfix/src/global/mail_params.h +++ b/postfix/src/global/mail_params.h @@ -23,14 +23,6 @@ typedef int bool; #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 @@ -207,9 +199,17 @@ extern char *var_config_dir; 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 diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 51c22f0a6..3fe444180 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -15,7 +15,7 @@ * 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 diff --git a/postfix/src/lmtp/.indent.pro b/postfix/src/lmtp/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/lmtp/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/lmtp/.indent.pro b/postfix/src/lmtp/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/lmtp/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/local/.indent.pro b/postfix/src/local/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/local/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/local/.indent.pro b/postfix/src/local/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/local/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/local/Makefile.in b/postfix/src/local/Makefile.in index 022a70881..ba87abf37 100644 --- a/postfix/src/local/Makefile.in +++ b/postfix/src/local/Makefile.in @@ -355,10 +355,13 @@ recipient.o: ../../include/vbuf.h 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 diff --git a/postfix/src/master/.indent.pro b/postfix/src/master/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/master/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/master/.indent.pro b/postfix/src/master/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/master/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/nqmgr/.indent.pro b/postfix/src/nqmgr/.indent.pro deleted file mode 100644 index 77b72cd02..000000000 --- a/postfix/src/nqmgr/.indent.pro +++ /dev/null @@ -1,123 +0,0 @@ --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 diff --git a/postfix/src/nqmgr/.indent.pro b/postfix/src/nqmgr/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/nqmgr/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/nqmgr/Makefile.in b/postfix/src/nqmgr/Makefile.in index 83354ffcf..376304e05 100644 --- a/postfix/src/nqmgr/Makefile.in +++ b/postfix/src/nqmgr/Makefile.in @@ -136,6 +136,7 @@ qmgr_deliver.o: ../../include/mail_queue.h 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 @@ -164,9 +165,23 @@ qmgr_entry.o: ../../include/scan_dir.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 @@ -205,6 +220,18 @@ qmgr_move.o: qmgr.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 diff --git a/postfix/src/nqmgr/qmgr.c b/postfix/src/nqmgr/qmgr.c index 74acca9e1..7c1d11a95 100644 --- a/postfix/src/nqmgr/qmgr.c +++ b/postfix/src/nqmgr/qmgr.c @@ -227,14 +227,14 @@ /* .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. @@ -270,6 +270,11 @@ /* 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. */ diff --git a/postfix/src/nqmgr/qmgr.h b/postfix/src/nqmgr/qmgr.h index 5982b4f60..2da9dea0b 100644 --- a/postfix/src/nqmgr/qmgr.h +++ b/postfix/src/nqmgr/qmgr.h @@ -124,11 +124,10 @@ struct QMGR_TRANSPORT { 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 */ @@ -257,7 +256,8 @@ struct QMGR_MESSAGE { 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 */ @@ -299,14 +299,14 @@ struct QMGR_JOB { 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 */ @@ -405,4 +405,9 @@ extern char *qmgr_scan_next(QMGR_SCAN *); /* 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 /*--*/ diff --git a/postfix/src/nqmgr/qmgr_bounce.c b/postfix/src/nqmgr/qmgr_bounce.c index d6631c0ad..e8f01405f 100644 --- a/postfix/src/nqmgr/qmgr_bounce.c +++ b/postfix/src/nqmgr/qmgr_bounce.c @@ -35,6 +35,11 @@ /* 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. */ diff --git a/postfix/src/nqmgr/qmgr_defer.c b/postfix/src/nqmgr/qmgr_defer.c index 26560347c..72d30aac9 100644 --- a/postfix/src/nqmgr/qmgr_defer.c +++ b/postfix/src/nqmgr/qmgr_defer.c @@ -60,6 +60,11 @@ /* 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. */ diff --git a/postfix/src/nqmgr/qmgr_deliver.c b/postfix/src/nqmgr/qmgr_deliver.c index 60ad0f6a5..1c92881aa 100644 --- a/postfix/src/nqmgr/qmgr_deliver.c +++ b/postfix/src/nqmgr/qmgr_deliver.c @@ -39,6 +39,11 @@ /* 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. */ @@ -61,6 +66,7 @@ #include #include #include +#include /* Application-specific. */ @@ -117,7 +123,8 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream) 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, diff --git a/postfix/src/nqmgr/qmgr_entry.c b/postfix/src/nqmgr/qmgr_entry.c index 3fa16b8b2..079ae7a60 100644 --- a/postfix/src/nqmgr/qmgr_entry.c +++ b/postfix/src/nqmgr/qmgr_entry.c @@ -69,6 +69,11 @@ /* 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. */ diff --git a/postfix/src/nqmgr/qmgr_message.c b/postfix/src/nqmgr/qmgr_message.c index 7814ff632..e294bd530 100644 --- a/postfix/src/nqmgr/qmgr_message.c +++ b/postfix/src/nqmgr/qmgr_message.c @@ -72,6 +72,11 @@ /* 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. */ @@ -79,11 +84,11 @@ #include #include #include +#include /* sscanf() */ #include #include #include #include -#include /* sscanf() */ #ifdef STRCASECMP_IN_STRINGS_H #include @@ -150,6 +155,7 @@ static QMGR_MESSAGE *qmgr_message_create(const char *queue_name, 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; @@ -364,6 +370,9 @@ static int qmgr_message_read(QMGR_MESSAGE *message) } 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); @@ -832,6 +841,8 @@ void qmgr_message_free(QMGR_MESSAGE *message) 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); diff --git a/postfix/src/nqmgr/qmgr_queue.c b/postfix/src/nqmgr/qmgr_queue.c index 9eeb49248..29ee05a4f 100644 --- a/postfix/src/nqmgr/qmgr_queue.c +++ b/postfix/src/nqmgr/qmgr_queue.c @@ -70,6 +70,11 @@ /* 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. */ diff --git a/postfix/src/nqmgr/qmgr_transport.c b/postfix/src/nqmgr/qmgr_transport.c index e87ee7c44..ff851b1c5 100644 --- a/postfix/src/nqmgr/qmgr_transport.c +++ b/postfix/src/nqmgr/qmgr_transport.c @@ -64,6 +64,11 @@ /* 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. */ diff --git a/postfix/src/pickup/.indent.pro b/postfix/src/pickup/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/pickup/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/pickup/.indent.pro b/postfix/src/pickup/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/pickup/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/pipe/.indent.pro b/postfix/src/pipe/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/pipe/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/pipe/.indent.pro b/postfix/src/pipe/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/pipe/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/pipe/Makefile.in b/postfix/src/pipe/Makefile.in index 33c636908..597b994e4 100644 --- a/postfix/src/pipe/Makefile.in +++ b/postfix/src/pipe/Makefile.in @@ -81,4 +81,5 @@ pipe.o: ../../include/mail_copy.h 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 diff --git a/postfix/src/postalias/.indent.pro b/postfix/src/postalias/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postalias/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postalias/.indent.pro b/postfix/src/postalias/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postalias/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postcat/.indent.pro b/postfix/src/postcat/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postcat/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postcat/.indent.pro b/postfix/src/postcat/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postcat/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postconf/.indent.pro b/postfix/src/postconf/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postconf/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postconf/.indent.pro b/postfix/src/postconf/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postconf/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postdrop/.indent.pro b/postfix/src/postdrop/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postdrop/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postdrop/.indent.pro b/postfix/src/postdrop/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postdrop/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postfix/.indent.pro b/postfix/src/postfix/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postfix/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postfix/.indent.pro b/postfix/src/postfix/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postfix/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postkick/.indent.pro b/postfix/src/postkick/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postkick/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postkick/.indent.pro b/postfix/src/postkick/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postkick/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postlock/.indent.pro b/postfix/src/postlock/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postlock/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postlock/.indent.pro b/postfix/src/postlock/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postlock/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postlog/.indent.pro b/postfix/src/postlog/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postlog/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postlog/.indent.pro b/postfix/src/postlog/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postlog/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postlog/Makefile.in b/postfix/src/postlog/Makefile.in index 6ce0539fd..a5988ea04 100644 --- a/postfix/src/postlog/Makefile.in +++ b/postfix/src/postlog/Makefile.in @@ -68,3 +68,4 @@ postlog.o: ../../include/msg_output.h postlog.o: ../../include/msg_vstream.h postlog.o: ../../include/msg_syslog.h postlog.o: ../../include/mail_params.h +postlog.o: ../../include/mail_conf.h diff --git a/postfix/src/postlog/postlog.c b/postfix/src/postlog/postlog.c index ece9daf50..3fc5d8c51 100644 --- a/postfix/src/postlog/postlog.c +++ b/postfix/src/postlog/postlog.c @@ -5,8 +5,8 @@ /* 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. @@ -20,6 +20,9 @@ /* 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" @@ -71,6 +74,7 @@ /* Global library. */ #include /* XXX right place for LOG_FACILITY? */ +#include /* Application-specific. */ @@ -176,7 +180,11 @@ int main(int argc, char **argv) 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; @@ -201,6 +209,12 @@ int main(int argc, char **argv) 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. */ diff --git a/postfix/src/postmap/.indent.pro b/postfix/src/postmap/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postmap/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postmap/.indent.pro b/postfix/src/postmap/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postmap/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/postsuper/.indent.pro b/postfix/src/postsuper/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/postsuper/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/postsuper/.indent.pro b/postfix/src/postsuper/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/postsuper/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/qmgr/.indent.pro b/postfix/src/qmgr/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/qmgr/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/qmgr/.indent.pro b/postfix/src/qmgr/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/qmgr/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/sendmail/.indent.pro b/postfix/src/sendmail/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/sendmail/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/sendmail/.indent.pro b/postfix/src/sendmail/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/sendmail/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/showq/.indent.pro b/postfix/src/showq/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/showq/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/showq/.indent.pro b/postfix/src/showq/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/showq/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/smtp/.indent.pro b/postfix/src/smtp/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/smtp/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/smtp/.indent.pro b/postfix/src/smtp/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/smtp/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/smtpd/.indent.pro b/postfix/src/smtpd/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/smtpd/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/smtpd/.indent.pro b/postfix/src/smtpd/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/smtpd/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/smtpd/Makefile.in b/postfix/src/smtpd/Makefile.in index f81aad895..72eddfd3b 100644 --- a/postfix/src/smtpd/Makefile.in +++ b/postfix/src/smtpd/Makefile.in @@ -107,6 +107,7 @@ smtpd.o: ../../include/smtp_stream.h 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 diff --git a/postfix/src/smtpstone/.indent.pro b/postfix/src/smtpstone/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/smtpstone/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/smtpstone/.indent.pro b/postfix/src/smtpstone/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/smtpstone/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/spawn/.indent.pro b/postfix/src/spawn/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/spawn/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/spawn/.indent.pro b/postfix/src/spawn/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/spawn/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/trivial-rewrite/.indent.pro b/postfix/src/trivial-rewrite/.indent.pro deleted file mode 100644 index 5fbb816df..000000000 --- a/postfix/src/trivial-rewrite/.indent.pro +++ /dev/null @@ -1,120 +0,0 @@ --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 diff --git a/postfix/src/trivial-rewrite/.indent.pro b/postfix/src/trivial-rewrite/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/trivial-rewrite/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/util/.indent.pro b/postfix/src/util/.indent.pro deleted file mode 100644 index 15931a7c1..000000000 --- a/postfix/src/util/.indent.pro +++ /dev/null @@ -1,121 +0,0 @@ --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 diff --git a/postfix/src/util/.indent.pro b/postfix/src/util/.indent.pro new file mode 120000 index 000000000..5c837eca6 --- /dev/null +++ b/postfix/src/util/.indent.pro @@ -0,0 +1 @@ +../../.indent.pro \ No newline at end of file diff --git a/postfix/src/util/msg_syslog.c b/postfix/src/util/msg_syslog.c index 2ff60ce45..a06aeb2fe 100644 --- a/postfix/src/util/msg_syslog.c +++ b/postfix/src/util/msg_syslog.c @@ -10,12 +10,19 @@ /* 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 @@ -37,7 +44,7 @@ /* System libraries. */ #include -#include /* 44BSD stdarg.h uses abort() */ +#include /* 44BSD stdarg.h uses abort() */ #include #include #include @@ -51,10 +58,85 @@ #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) @@ -70,9 +152,10 @@ 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); } } @@ -90,6 +173,21 @@ void msg_syslog_init(const char *name, int logopt, int facility) } } +/* 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 /* diff --git a/postfix/src/util/msg_syslog.h b/postfix/src/util/msg_syslog.h index 94e1ea3ff..863fb2d51 100644 --- a/postfix/src/util/msg_syslog.h +++ b/postfix/src/util/msg_syslog.h @@ -19,6 +19,7 @@ * External interface. */ extern void msg_syslog_init(const char *, int, int); +extern int msg_syslog_facility(const char *); /* LICENSE /* .ad