diff --git a/misc/move/exim4.conf b/misc/move/exim4.conf deleted file mode 100644 index 5c0be82..0000000 --- a/misc/move/exim4.conf +++ /dev/null @@ -1,2100 +0,0 @@ -##################################################### -### main/01_exim4-config_listmacrosdefs -##################################################### -###################################################################### -# Runtime configuration file for Exim 4 (Debian Packaging) # -###################################################################### - -###################################################################### -# /etc/exim4/exim4.conf.template is only used with the non-split -# configuration scheme. -# /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs is only used -# with the split configuration scheme. -# If you find this comment anywhere else, somebody copied it there. -# Documentation about the Debian exim4 configuration scheme can be -# found in /usr/share/doc/exim4-base/README.Debian.gz. -###################################################################### - -###################################################################### -# MAIN CONFIGURATION SETTINGS # -###################################################################### - -system_filter = /etc/exim4/exim4.filter -MLMMJ_HOME=/var/spool/mlmmj/$domain -domainlist mlmmj_domains = lsearch;/var/spool/mlmmj/passwords.txt -delay_warning_condition = ${if match_domain{$domain}{+mlmmj_domains}{no}{yes}} - -# Just for reference and scripts. -# On Debian systems, the main binary is installed as exim4 to avoid -# conflicts with the exim 3 packages. -exim_path = /usr/sbin/exim4 - -# Macro defining the main configuration directory. -# We do not use absolute paths. -.ifndef CONFDIR -CONFDIR = /etc/exim4 -.endif - -# debconf-driven macro definitions get inserted after this line -UPEX4CmacrosUPEX4C = 1 - -# Create domain and host lists for relay control -# '@' refers to 'the name of the local host' - -# List of domains considered local for exim. Domains not listed here -# need to be deliverable remotely. -domainlist local_domains = MAIN_LOCAL_DOMAINS - -# List of recipient domains to relay _to_. Use this list if you're - -# for example - fallback MX or mail gateway for domains. -domainlist relay_to_domains = MAIN_RELAY_TO_DOMAINS : +mlmmj_domains - -# List of sender networks (IP addresses) to _unconditionally_ relay -# _for_. If you intend to be SMTP AUTH server, you do not need to enter -# anything here. -hostlist relay_from_hosts = localhost - -# Decide which domain to use to add to all unqualified addresses. -# If MAIN_PRIMARY_HOSTNAME_AS_QUALIFY_DOMAIN is defined, the primary -# hostname is used. If not, but MAIN_QUALIFY_DOMAIN is set, the value -# of MAIN_QUALIFY_DOMAIN is used. If both macros are not defined, -# the first line of /etc/mailname is used. -.ifndef MAIN_PRIMARY_HOSTNAME_AS_QUALIFY_DOMAIN -.ifndef MAIN_QUALIFY_DOMAIN -qualify_domain = ETC_MAILNAME -.else -qualify_domain = MAIN_QUALIFY_DOMAIN -.endif -.endif - -# listen on all all interfaces? -.ifdef MAIN_LOCAL_INTERFACES -local_interfaces = MAIN_LOCAL_INTERFACES -.endif - -.ifndef LOCAL_DELIVERY -# The default transport, set in /etc/exim4/update-exim4.conf.conf, -# defaulting to mail_spool. See CONFDIR/conf.d/transport/ for possibilities -LOCAL_DELIVERY=mail_spool -.endif - -# The gecos field in /etc/passwd holds not only the name. see passwd(5). -gecos_pattern = ^([^,:]*) -gecos_name = $1 - -# define macros to be used in acl/30_exim4-config_check_rcpt to check -# recipient local parts for strange characters. - -# This macro definition really should be in -# acl/30_exim4-config_check_rcpt but cannot be there due to -# http://www.exim.org/bugzilla/show_bug.cgi?id=101 as of exim 4.62. - -# These macros are documented in acl/30_exim4-config_check_rcpt, -# can be changed here or overridden by a locally added configuration -# file as described in README.Debian chapter 2.1.2 - -.ifndef CHECK_RCPT_LOCAL_LOCALPARTS -CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|`#&?] -.endif - -.ifndef CHECK_RCPT_REMOTE_LOCALPARTS -CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./ -.endif - -# always log tls_peerdn as we use TLS for outgoing connects by default -.ifndef MAIN_LOG_SELECTOR -MAIN_LOG_SELECTOR = +tls_peerdn -.endif -##################################################### -### end main/01_exim4-config_listmacrosdefs -##################################################### -##################################################### -### main/02_exim4-config_options -##################################################### - -### main/02_exim4-config_options -################################# - - -# Defines the access control list that is run when an -# SMTP MAIL command is received. -# -.ifndef MAIN_ACL_CHECK_MAIL -MAIN_ACL_CHECK_MAIL = acl_check_mail -.endif -acl_smtp_mail = MAIN_ACL_CHECK_MAIL - - -# Defines the access control list that is run when an -# SMTP RCPT command is received. -# -.ifndef MAIN_ACL_CHECK_RCPT -MAIN_ACL_CHECK_RCPT = acl_check_rcpt -.endif -acl_smtp_rcpt = MAIN_ACL_CHECK_RCPT - - -# Defines the access control list that is run when an -# SMTP DATA command is received. -# -.ifndef MAIN_ACL_CHECK_DATA -MAIN_ACL_CHECK_DATA = acl_check_data -.endif -acl_smtp_data = MAIN_ACL_CHECK_DATA - - -# Message size limit. The default (used when MESSAGE_SIZE_LIMIT -# is unset) is 50 MB -.ifdef MESSAGE_SIZE_LIMIT -message_size_limit = MESSAGE_SIZE_LIMIT -.endif - - -# If you are running exim4-daemon-heavy or a custom version of Exim that -# was compiled with the content-scanning extension, you can cause incoming -# messages to be automatically scanned for viruses. You have to modify the -# configuration in two places to set this up. The first of them is here, -# where you define the interface to your scanner. This example is typical -# for ClamAV; see the manual for details of what to set for other virus -# scanners. The second modification is in the acl_check_data access -# control list. - -# av_scanner = clamd:/var/run/clamav/clamd.ctl - - -# For spam scanning, there is a similar option that defines the interface to -# SpamAssassin. You do not need to set this if you are using the default, which -# is shown in this commented example. As for virus scanning, you must also -# modify the acl_check_data access control list to enable spam scanning. - -# spamd_address = 127.0.0.1 783 - -# Domain used to qualify unqualified recipient addresses -# If this option is not set, the qualify_domain value is used. -# qualify_recipient = - - -# Allow Exim to recognize addresses of the form "user@[10.11.12.13]", -# where the domain part is a "domain literal" (an IP address) instead -# of a named domain. The RFCs require this facility, but it is disabled -# in the default config since it is seldomly used and frequently abused. -# Domain literal support also needs a special router, which is automatically -# enabled if you use the enable macro MAIN_ALLOW_DOMAIN_LITERALS. -# Additionally, you might want to make your local IP addresses (or @[]) -# local domains. -.ifdef MAIN_ALLOW_DOMAIN_LITERALS -allow_domain_literals -.endif - - -# Do a reverse DNS lookup on all incoming IP calls, in order to get the -# true host name. If you feel this is too expensive, the networks for -# which a lookup is done can be listed here. -.ifndef DC_minimaldns -.ifndef MAIN_HOST_LOOKUP -MAIN_HOST_LOOKUP = * -.endif -host_lookup = MAIN_HOST_LOOKUP -.endif - - -# In a minimaldns setup, update-exim4.conf guesses the hostname and -# dumps it here to avoid DNS lookups being done at Exim run time. -.ifdef MAIN_HARDCODE_PRIMARY_HOSTNAME -primary_hostname = MAIN_HARDCODE_PRIMARY_HOSTNAME -.endif - -# The settings below, which are actually the same as the defaults in the -# code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP -# calls. You can limit the hosts to which these calls are made, and/or change -# the timeout that is used. If you set the timeout to zero, all RFC 1413 calls -# are disabled. RFC 1413 calls are cheap and can provide useful information -# for tracing problem messages, but some hosts and firewalls are -# misconfigured to drop the requests instead of either answering or -# rejecting them. This can result in a timeout instead of an immediate refused -# connection, leading to delays on starting up SMTP sessions. (The default was -# reduced from 30s to 5s for release 4.61.) -# rfc1413_hosts = * -# rfc1413_query_timeout = 5s - -# When using an external relay tester (such as rt.njabl.org and/or the -# currently defunct relay-test.mail-abuse.org, the test may be aborted -# since exim complains about "too many nonmail commands". If you want -# the test to complete, add the host from where "your" relay tester -# connects from to the MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS macro. -# Please note that a non-empty setting may cause extra DNS lookups to -# happen, which is the reason why this option is commented out in the -# default settings. -# MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS = !rt.njabl.org -.ifdef MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS -smtp_accept_max_nonmail_hosts = MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS -.endif - -# By default, exim forces a Sender: header containing the local -# account name at the local host name in all locally submitted messages -# that don't have the local account name at the local host name in the -# From: header, deletes any Sender: header present in the submitted -# message and forces the envelope sender of all locally submitted -# messages to the local account name at the local host name. -# The following settings allow local users to specify their own envelope sender -# in a locally submitted message. Sender: headers existing in a locally -# submitted message are not removed, and no automatic Sender: headers -# are added. These settings are fine for most hosts. -# If you run exim on a classical multi-user systems where all users -# have local mailboxes that can be reached via SMTP from the Internet -# with the local FQDN as the domain part of the address, you might want -# to disable the following three lines for traceability reasons. -.ifndef MAIN_FORCE_SENDER -local_from_check = false -local_sender_retain = true -untrusted_set_sender = * -.endif - - -# By default, Exim expects all envelope addresses to be fully qualified, that -# is, they must contain both a local part and a domain. Configure exim -# to accept unqualified addresses from certain hosts. When this is done, -# unqualified addresses are qualified using the settings of qualify_domain -# and/or qualify_recipient (see above). -# sender_unqualified_hosts = -# recipient_unqualified_hosts = - - -# Configure Exim to support the "percent hack" for certain domains. -# The "percent hack" is the feature by which mail addressed to x%y@z -# (where z is one of the domains listed) is locally rerouted to x@y -# and sent on. If z is not one of the "percent hack" domains, x%y is -# treated as an ordinary local part. The percent hack is rarely needed -# nowadays but frequently abused. You should not enable it unless you -# are sure that you really need it. -# percent_hack_domains = - - -# Bounce handling -.ifndef MAIN_IGNORE_BOUNCE_ERRORS_AFTER -MAIN_IGNORE_BOUNCE_ERRORS_AFTER = 2d -.endif -ignore_bounce_errors_after = MAIN_IGNORE_BOUNCE_ERRORS_AFTER - -.ifndef MAIN_TIMEOUT_FROZEN_AFTER -MAIN_TIMEOUT_FROZEN_AFTER = 7d -.endif -timeout_frozen_after = MAIN_TIMEOUT_FROZEN_AFTER - -.ifndef MAIN_FREEZE_TELL -MAIN_FREEZE_TELL = postmaster -.endif -freeze_tell = MAIN_FREEZE_TELL - - -# Define spool directory -.ifndef SPOOLDIR -SPOOLDIR = /var/spool/exim4 -.endif -spool_directory = SPOOLDIR - - -# trusted users can set envelope-from to arbitrary values -.ifndef MAIN_TRUSTED_USERS -MAIN_TRUSTED_USERS = uucp -.endif -trusted_users = MAIN_TRUSTED_USERS -.ifdef MAIN_TRUSTED_GROUPS -trusted_groups = MAIN_TRUSTED_GROUPS -.endif - - -# users in admin group can do many other things -# admin_groups = - - -# SMTP Banner. The example includes the Debian version in the SMTP dialog -# MAIN_SMTP_BANNER = "${primary_hostname} ESMTP Exim ${version_number} (Debian package MAIN_PACKAGE_VERSION) ${tod_full}" -# smtp_banner = $smtp_active_hostname ESMTP Exim $version_number $tod_full - -.ifdef MAIN_KEEP_ENVIRONMENT -keep_environment = MAIN_KEEP_ENVIRONMENT -.else -# set option to empty value to avoid warning. -keep_environment = -.endif -.ifdef MAIN_ADD_ENVIRONMENT -add_environment = MAIN_ADD_ENVIRONMENT -.endif -##################################################### -### end main/02_exim4-config_options -##################################################### -##################################################### -### main/03_exim4-config_tlsoptions -##################################################### - -### main/03_exim4-config_tlsoptions -################################# - -# TLS/SSL configuration for exim as an SMTP server. -# See /usr/share/doc/exim4-base/README.Debian.gz for explanations. - -.ifdef MAIN_TLS_ENABLE -# Defines what hosts to 'advertise' STARTTLS functionality to. The -# default, *, will advertise to all hosts that connect with EHLO. -.ifndef MAIN_TLS_ADVERTISE_HOSTS -MAIN_TLS_ADVERTISE_HOSTS = * -.endif -tls_advertise_hosts = MAIN_TLS_ADVERTISE_HOSTS - - -# Full paths to Certificate and Private Key. The Private Key file -# must be kept 'secret' and should be owned by root.Debian-exim mode -# 640 (-rw-r-----). exim-gencert takes care of these prerequisites. -# Normally, exim4 looks for certificate and key in different files: -# MAIN_TLS_CERTIFICATE - path to certificate file, -# CONFDIR/exim.crt if unset -# MAIN_TLS_PRIVATEKEY - path to private key file -# CONFDIR/exim.key if unset -# You can also configure exim to look for certificate and key in the -# same file, set MAIN_TLS_CERTKEY to that file to enable. This takes -# precedence over all other settings regarding certificate and key file. -.ifdef MAIN_TLS_CERTKEY -tls_certificate = MAIN_TLS_CERTKEY -.else -.ifndef MAIN_TLS_CERTIFICATE -MAIN_TLS_CERTIFICATE = CONFDIR/exim.crt -.endif -tls_certificate = MAIN_TLS_CERTIFICATE - -.ifndef MAIN_TLS_PRIVATEKEY -MAIN_TLS_PRIVATEKEY = CONFDIR/exim.key -.endif -tls_privatekey = MAIN_TLS_PRIVATEKEY -.endif - -# Pointer to the CA Certificates against which client certificates are -# checked. This is controlled by the `tls_verify_hosts' and -# `tls_try_verify_hosts' lists below. -# If you want to check server certificates, you need to add an -# tls_verify_certificates statement to the smtp transport. -# /etc/ssl/certs/ca-certificates.crt is generated by -# the "ca-certificates" package's update-ca-certificates(8) command. -.ifndef MAIN_TLS_VERIFY_CERTIFICATES -MAIN_TLS_VERIFY_CERTIFICATES = ${if exists{/etc/ssl/certs/ca-certificates.crt}\ - {/etc/ssl/certs/ca-certificates.crt}\ - {/dev/null}} -.endif -tls_verify_certificates = MAIN_TLS_VERIFY_CERTIFICATES - - -# A list of hosts which are constrained by `tls_verify_certificates'. A host -# that matches `tls_verify_host' must present a certificate that is -# verifyable through `tls_verify_certificates' in order to be accepted as an -# SMTP client. If it does not, the connection is aborted. -.ifdef MAIN_TLS_VERIFY_HOSTS -tls_verify_hosts = MAIN_TLS_VERIFY_HOSTS -.endif - -# A weaker form of checking: if a client matches `tls_try_verify_hosts' (but -# not `tls_verify_hosts'), request a certificate and check it against -# `tls_verify_certificates' but do not abort the connection if there is no -# certificate or if the certificate presented does not match. (This -# condition can be tested for in ACLs through `verify = certificate') -# By default, this check is done for all hosts. It is known that some -# clients (including incredimail's version downloadable in February -# 2008) choke on this. To disable, set MAIN_TLS_TRY_VERIFY_HOSTS to an -# empty value. -.ifdef MAIN_TLS_TRY_VERIFY_HOSTS -tls_try_verify_hosts = MAIN_TLS_TRY_VERIFY_HOSTS -.endif - -.endif -##################################################### -### end main/03_exim4-config_tlsoptions -##################################################### -##################################################### -### main/90_exim4-config_log_selector -##################################################### - -### main/90_exim4-config_log_selector -################################# - -# uncomment this for debugging -# MAIN_LOG_SELECTOR == MAIN_LOG_SELECTOR +all -subject -arguments - -.ifdef MAIN_LOG_SELECTOR -log_selector = MAIN_LOG_SELECTOR -.endif -##################################################### -### end main/90_exim4-config_log_selector -##################################################### -##################################################### -### acl/00_exim4-config_header -##################################################### - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### -begin acl - - -##################################################### -### end acl/00_exim4-config_header -##################################################### -##################################################### -### acl/20_exim4-config_local_deny_exceptions -##################################################### - -### acl/20_exim4-config_local_deny_exceptions -################################# - -# This is used to determine whitelisted senders and hosts. -# It checks for CONFDIR/host_local_deny_exceptions and -# CONFDIR/sender_local_deny_exceptions. -# -# It is meant to be used from some other acl entry. -# -# See exim4-config_files(5) for details. -# -# If the files do not exist, the white list never matches, which is -# the desired behaviour. -# -# The old file names CONFDIR/local_host_whitelist and -# CONFDIR/local_sender_whitelist will continue to be honored for a -# transition period. Their use is deprecated. - -acl_local_deny_exceptions: - accept - hosts = ${if exists{CONFDIR/host_local_deny_exceptions}\ - {CONFDIR/host_local_deny_exceptions}\ - {}} - accept - senders = ${if exists{CONFDIR/sender_local_deny_exceptions}\ - {CONFDIR/sender_local_deny_exceptions}\ - {}} - accept - hosts = ${if exists{CONFDIR/local_host_whitelist}\ - {CONFDIR/local_host_whitelist}\ - {}} - accept - senders = ${if exists{CONFDIR/local_sender_whitelist}\ - {CONFDIR/local_sender_whitelist}\ - {}} - - # This hook allows you to hook in your own ACLs without having to - # modify this file. If you do it like we suggest, you'll end up with - # a small performance penalty since there is an additional file being - # accessed. This doesn't happen if you leave the macro unset. - .ifdef LOCAL_DENY_EXCEPTIONS_LOCAL_ACL_FILE - .include LOCAL_DENY_EXCEPTIONS_LOCAL_ACL_FILE - .endif - - # this is still supported for a transition period and is deprecated. - .ifdef WHITELIST_LOCAL_DENY_LOCAL_ACL_FILE - .include WHITELIST_LOCAL_DENY_LOCAL_ACL_FILE - .endif -##################################################### -### end acl/20_exim4-config_local_deny_exceptions -##################################################### -##################################################### -### acl/30_exim4-config_check_mail -##################################################### - -### acl/30_exim4-config_check_mail -################################# - -# This access control list is used for every MAIL command in an incoming -# SMTP message. The tests are run in order until the address is either -# accepted or denied. -# -acl_check_mail: - .ifdef CHECK_MAIL_HELO_ISSUED - deny - message = no HELO given before MAIL command - condition = ${if def:sender_helo_name {no}{yes}} - .endif - - accept -##################################################### -### end acl/30_exim4-config_check_mail -##################################################### -##################################################### -### acl/30_exim4-config_check_rcpt -##################################################### - -### acl/30_exim4-config_check_rcpt -################################# - -# This access control list is used for every RCPT command in an incoming -# SMTP message. The tests are run in order until the address is either -# accepted or denied. -# -acl_check_rcpt: - - # Accept if the source is local SMTP (i.e. not over TCP/IP). We do this by - # testing for an empty sending host field. - accept - hosts = : - control = dkim_disable_verify - - # Do not try to verify DKIM signatures of incoming mail if DC_minimaldns - # or DISABLE_DKIM_VERIFY are set. -.ifdef DC_minimaldns - warn - control = dkim_disable_verify -.else -.ifdef DISABLE_DKIM_VERIFY - warn - control = dkim_disable_verify -.endif -.endif - - # The following section of the ACL is concerned with local parts that contain - # certain non-alphanumeric characters. Dots in unusual places are - # handled by this ACL as well. - # - # Non-alphanumeric characters other than dots are rarely found in genuine - # local parts, but are often tried by people looking to circumvent - # relaying restrictions. Therefore, although they are valid in local - # parts, these rules disallow certain non-alphanumeric characters, as - # a precaution. - # - # Empty components (two dots in a row) are not valid in RFC 2822, but Exim - # allows them because they have been encountered. (Consider local parts - # constructed as "firstinitial.secondinitial.familyname" when applied to - # a name without a second initial.) However, a local part starting - # with a dot or containing /../ can cause trouble if it is used as part of a - # file name (e.g. for a mailing list). This is also true for local parts that - # contain slashes. A pipe symbol can also be troublesome if the local part is - # incorporated unthinkingly into a shell command line. - # - # These ACL components will block recipient addresses that are valid - # from an RFC2822 point of view. We chose to have them blocked by - # default for security reasons. - # - # If you feel that your site should have less strict recipient - # checking, please feel free to change the default values of the macros - # defined in main/01_exim4-config_listmacrosdefs or override them from a - # local configuration file. - # - # Two different rules are used. The first one has a quite strict - # default, and is applied to messages that are addressed to one of the - # local domains handled by this host. - - # The default value of CHECK_RCPT_LOCAL_LOCALPARTS is defined in - # main/01_exim4-config_listmacrosdefs: - # CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|`#&?] - # This blocks local parts that begin with a dot or contain a quite - # broad range of non-alphanumeric characters. - .ifdef CHECK_RCPT_LOCAL_LOCALPARTS - deny - domains = +local_domains - local_parts = CHECK_RCPT_LOCAL_LOCALPARTS - message = restricted characters in address - .endif - - - # The second rule applies to all other domains, and its default is - # considerably less strict. - - # The default value of CHECK_RCPT_REMOTE_LOCALPARTS is defined in - # main/01_exim4-config_listmacrosdefs: - # CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./ - - # It allows local users to send outgoing messages to sites - # that use slashes and vertical bars in their local parts. It blocks - # local parts that begin with a dot, slash, or vertical bar, but allows - # these characters within the local part. However, the sequence /../ is - # barred. The use of some other non-alphanumeric characters is blocked. - # Single quotes might probably be dangerous as well, but they're - # allowed by the default regexps to avoid rejecting mails to Ireland. - # The motivation here is to prevent local users (or local users' malware) - # from mounting certain kinds of attack on remote sites. - .ifdef CHECK_RCPT_REMOTE_LOCALPARTS - deny - domains = !+local_domains - local_parts = CHECK_RCPT_REMOTE_LOCALPARTS - message = restricted characters in address - .endif - - - # Accept mail to postmaster in any local domain, regardless of the source, - # and without verifying the sender. - # - accept - .ifndef CHECK_RCPT_POSTMASTER - local_parts = postmaster - .else - local_parts = CHECK_RCPT_POSTMASTER - .endif - domains = +local_domains : +relay_to_domains - - - # Deny unless the sender address can be verified. - # - # This is disabled by default so that DNSless systems don't break. If - # your system can do DNS lookups without delay or cost, you might want - # to enable this feature. - # - # This feature does not work in smarthost and satellite setups as - # with these setups all domains pass verification. See spec.txt chapter - # 39.31 with the added information that a smarthost/satellite setup - # routes all non-local e-mail to the smarthost. - .ifdef CHECK_RCPT_VERIFY_SENDER - deny - message = Sender verification failed - !acl = acl_local_deny_exceptions - !verify = sender - .endif - - # Verify senders listed in local_sender_callout with a callout. - # - # In smarthost and satellite setups, this causes the callout to be - # done to the smarthost. Verification will thus only be reliable if the - # smarthost does reject illegal addresses in the SMTP dialog. - deny - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_callout}\ - {CONFDIR/local_sender_callout}\ - {}} - !verify = sender/callout - - - # Accept if the message comes from one of the hosts for which we are an - # outgoing relay. It is assumed that such hosts are most likely to be MUAs, - # so we set control=submission to make Exim treat the message as a - # submission. It will fix up various errors in the message, for example, the - # lack of a Date: header line. If you are actually relaying out out from - # MTAs, you may want to disable this. If you are handling both relaying from - # MTAs and submissions from MUAs you should probably split them into two - # lists, and handle them differently. - - # Recipient verification is omitted here, because in many cases the clients - # are dumb MUAs that don't cope well with SMTP error responses. If you are - # actually relaying out from MTAs, you should probably add recipient - # verification here. - - # Note that, by putting this test before any DNS black list checks, you will - # always accept from these hosts, even if they end up on a black list. The - # assumption is that they are your friends, and if they get onto black - # list, it is a mistake. - accept - hosts = +relay_from_hosts - control = submission/sender_retain - control = dkim_disable_verify - - - # Accept if the message arrived over an authenticated connection, from - # any host. Again, these messages are usually from MUAs, so recipient - # verification is omitted, and submission mode is set. And again, we do this - # check before any black list tests. - accept - authenticated = * - control = submission/sender_retain - control = dkim_disable_verify - - - # Insist that any other recipient address that we accept is either in one of - # our local domains, or is in a domain for which we explicitly allow - # relaying. Any other domain is rejected as being unacceptable for relaying. - require - message = relay not permitted - domains = +local_domains : +relay_to_domains - - - # We also require all accepted addresses to be verifiable. This check will - # do local part verification for local domains, but only check the domain - # for remote domains. - require - verify = recipient - - - # Verify recipients listed in local_rcpt_callout with a callout. - # This is especially handy for forwarding MX hosts (secondary MX or - # mail hubs) of domains that receive a lot of spam to non-existent - # addresses. The only way to check local parts for remote relay - # domains is to use a callout (add /callout), but please read the - # documentation about callouts before doing this. - deny - !acl = acl_local_deny_exceptions - recipients = ${if exists{CONFDIR/local_rcpt_callout}\ - {CONFDIR/local_rcpt_callout}\ - {}} - !verify = recipient/callout - - - # CONFDIR/local_sender_blacklist holds a list of envelope senders that - # should have their access denied to the local host. Incoming messages - # with one of these senders are rejected at RCPT time. - # - # The explicit white lists are honored as well as negative items in - # the black list. See exim4-config_files(5) for details. - deny - message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - senders = ${if exists{CONFDIR/local_sender_blacklist}\ - {CONFDIR/local_sender_blacklist}\ - {}} - - - # deny bad sites (IP address) - # CONFDIR/local_host_blacklist holds a list of host names, IP addresses - # and networks (CIDR notation) that should have their access denied to - # The local host. Messages coming in from a listed host will have all - # RCPT statements rejected. - # - # The explicit white lists are honored as well as negative items in - # the black list. See exim4-config_files(5) for details. - deny - message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_local_deny_exceptions - hosts = ${if exists{CONFDIR/local_host_blacklist}\ - {CONFDIR/local_host_blacklist}\ - {}} - - - # Warn if the sender host does not have valid reverse DNS. - # - # If your system can do DNS lookups without delay or cost, you might want - # to enable this. - # If sender_host_address is defined, it's a remote call. If - # sender_host_name is not defined, then reverse lookup failed. Use - # this instead of !verify = reverse_host_lookup to catch deferrals - # as well as outright failures. - .ifdef CHECK_RCPT_REVERSE_DNS - warn - condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\ - {yes}{no}} - add_header = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}}) - .endif - - - # Use spfquery to perform a pair of SPF checks (for details, see - # http://www.openspf.org/) - # - # This is quite costly in terms of DNS lookups (~6 lookups per mail). Do not - # enable if that's an issue. Also note that if you enable this, you must - # install "spf-tools-perl" which provides the spfquery command. - # Missing spf-tools-perl will trigger the "Unexpected error in - # SPF check" warning. - .ifdef CHECK_RCPT_SPF - deny - message = [SPF] $sender_host_address is not allowed to send mail from \ - ${if def:sender_address_domain {$sender_address_domain}{$sender_helo_name}}. \ - Please see \ - http://www.openspf.org/Why?scope=${if def:sender_address_domain \ - {mfrom}{helo}};identity=${if def:sender_address_domain \ - {$sender_address}{$sender_helo_name}};ip=$sender_host_address - log_message = SPF check failed. - !acl = acl_local_deny_exceptions - condition = ${run{/usr/bin/spfquery.mail-spf-perl --ip \ - ${quote:$sender_host_address} --identity \ - ${if def:sender_address_domain \ - {--scope mfrom --identity ${quote:$sender_address}}\ - {--scope helo --identity ${quote:$sender_helo_name}}}}\ - {no}{${if eq {$runrc}{1}{yes}{no}}}} - - defer - message = Temporary DNS error while checking SPF record. Try again later. - !acl = acl_local_deny_exceptions - condition = ${if eq {$runrc}{5}{yes}{no}} - - warn - condition = ${if <={$runrc}{6}{yes}{no}} - add_header = Received-SPF: ${if eq {$runrc}{0}{pass}\ - {${if eq {$runrc}{2}{softfail}\ - {${if eq {$runrc}{3}{neutral}\ - {${if eq {$runrc}{4}{permerror}\ - {${if eq {$runrc}{6}{none}{error}}}}}}}}}\ - } client-ip=$sender_host_address; \ - ${if def:sender_address_domain \ - {envelope-from=${sender_address}; }{}}\ - helo=$sender_helo_name - - warn - log_message = Unexpected error in SPF check. - condition = ${if >{$runrc}{6}{yes}{no}} - .endif - - - # Check against classic DNS "black" lists (DNSBLs) which list - # sender IP addresses - .ifdef CHECK_RCPT_IP_DNSBLS - warn - dnslists = CHECK_RCPT_IP_DNSBLS - add_header = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - .endif - - - # Check against DNSBLs which list sender domains, with an option to locally - # whitelist certain domains that might be blacklisted. - # - # Note: If you define CHECK_RCPT_DOMAIN_DNSBLS, you must append - # "/$sender_address_domain" after each domain. For example: - # CHECK_RCPT_DOMAIN_DNSBLS = rhsbl.foo.org/$sender_address_domain \ - # : rhsbl.bar.org/$sender_address_domain - .ifdef CHECK_RCPT_DOMAIN_DNSBLS - warn - !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\ - {CONFDIR/local_domain_dnsbl_whitelist}\ - {}} - dnslists = CHECK_RCPT_DOMAIN_DNSBLS - add_header = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - .endif - - - # This hook allows you to hook in your own ACLs without having to - # modify this file. If you do it like we suggest, you'll end up with - # a small performance penalty since there is an additional file being - # accessed. This doesn't happen if you leave the macro unset. - .ifdef CHECK_RCPT_LOCAL_ACL_FILE - .include CHECK_RCPT_LOCAL_ACL_FILE - .endif - - - ############################################################################# - # This check is commented out because it is recognized that not every - # sysadmin will want to do it. If you enable it, the check performs - # Client SMTP Authorization (csa) checks on the sending host. These checks - # do DNS lookups for SRV records. The CSA proposal is currently (May 2005) - # an Internet draft. You can, of course, add additional conditions to this - # ACL statement to restrict the CSA checks to certain hosts only. - # - # require verify = csa - ############################################################################# - - - # Accept if the address is in a domain for which we are an incoming relay, - # but again, only if the recipient can be verified. - - accept - domains = +relay_to_domains - endpass - verify = recipient - - - # At this point, the address has passed all the checks that have been - # configured, so we accept it unconditionally. - - accept -##################################################### -### end acl/30_exim4-config_check_rcpt -##################################################### -##################################################### -### acl/40_exim4-config_check_data -##################################################### - -### acl/40_exim4-config_check_data -################################# - -# This ACL is used after the contents of a message have been received. This -# is the ACL in which you can test a message's headers or body, and in -# particular, this is where you can invoke external virus or spam scanners. - -acl_check_data: - - # Deny unless the address list headers are syntactically correct. - # - # If you enable this, you might reject legitimate mail. - .ifdef CHECK_DATA_VERIFY_HEADER_SYNTAX - deny - message = Message headers fail syntax check - !acl = acl_local_deny_exceptions - !verify = header_syntax - .endif - - - # require that there is a verifiable sender address in at least - # one of the "Sender:", "Reply-To:", or "From:" header lines. - .ifdef CHECK_DATA_VERIFY_HEADER_SENDER - deny - message = No verifiable sender address in message headers - !acl = acl_local_deny_exceptions - !verify = header_sender - .endif - - - # Deny if the message contains malware. Before enabling this check, you - # must install a virus scanner and set the av_scanner option in the - # main configuration. - # - # exim4-daemon-heavy must be used for this section to work. - # - # deny - # malware = * - # message = This message was detected as possible malware ($malware_name). - - - # Add headers to a message if it is judged to be spam. Before enabling this, - # you must install SpamAssassin. You also need to set the spamd_address - # option in the main configuration. - # - # exim4-daemon-heavy must be used for this section to work. - # - # Please note that this is only suiteable as an example. There are - # multiple issues with this configuration method. For example, if you go - # this way, you'll give your spamassassin daemon write access to the - # entire exim spool which might be a security issue in case of a - # spamassassin exploit. - # - # See the exim docs and the exim wiki for more suitable examples. - # - # warn - # spam = Debian-exim:true - # add_header = X-Spam_score: $spam_score\n\ - # X-Spam_score_int: $spam_score_int\n\ - # X-Spam_bar: $spam_bar\n\ - # X-Spam_report: $spam_report - - - # This hook allows you to hook in your own ACLs without having to - # modify this file. If you do it like we suggest, you'll end up with - # a small performance penalty since there is an additional file being - # accessed. This doesn't happen if you leave the macro unset. - .ifdef CHECK_DATA_LOCAL_ACL_FILE - .include CHECK_DATA_LOCAL_ACL_FILE - .endif - - - # accept otherwise - accept -##################################################### -### end acl/40_exim4-config_check_data -##################################################### -##################################################### -### router/00_exim4-config_header -##################################################### - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -# THE ORDER IN WHICH THE ROUTERS ARE DEFINED IS IMPORTANT! # -# An address is passed to each router in turn until it is accepted. # -###################################################################### - -begin routers - -mlmmj_router: - driver = accept - domains = +mlmmj_domains - require_files = MLMMJ_HOME/${lc::$local_part} - # Use this instead, if you don't want to give Exim rx rights to mlmmj spool. - # Exim will then spawn a new process running under the UID of "mlmmj". - #require_files = mlmmj:MLMMJ_HOME/${lc::$local_part} - local_part_suffix = +* - local_part_suffix_optional - headers_remove = Delivered-To - headers_add = Delivered-To: $local_part$local_part_suffix@$domain - transport = mlmmj_transport - -dnslookup: - driver = dnslookup - domains = ! +local_domains - transport = remote_smtp - ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8 - no_more - -##################################################### -### end router/00_exim4-config_header -##################################################### -##################################################### -### router/100_exim4-config_domain_literal -##################################################### - -### router/100_exim4-config_domain_literal -################################# - -# This router handles e-mail addresses in "domain literal" form like -# . The RFCs require this facility, but it is disabled -# in the default config since it is seldomly used and frequently abused. -# Domain literal support also needs to be enabled in the main config, -# which is automatically done if you use the enable macro -# MAIN_ALLOW_DOMAIN_LITERALS. - -.ifdef MAIN_ALLOW_DOMAIN_LITERALS -domain_literal: - debug_print = "R: domain_literal for $local_part@$domain" - driver = ipliteral - domains = ! +local_domains - transport = remote_smtp -.endif -##################################################### -### end router/100_exim4-config_domain_literal -##################################################### -##################################################### -### router/150_exim4-config_hubbed_hosts -##################################################### - -# router/150_exim4-config_hubbed_hosts -################################# - -# route specific domains manually. -# -# see exim4-config_files(5) and spec.txt chapter 20.3 through 20.7 for -# more detailed documentation. - -hubbed_hosts: - debug_print = "R: hubbed_hosts for $domain" - driver = manualroute - domains = "${if exists{CONFDIR/hubbed_hosts}\ - {partial-lsearch;CONFDIR/hubbed_hosts}\ - fail}" - same_domain_copy_routing = yes - route_data = ${lookup{$domain}partial-lsearch{CONFDIR/hubbed_hosts}} - transport = remote_smtp -##################################################### -### end router/150_exim4-config_hubbed_hosts -##################################################### -##################################################### -### router/200_exim4-config_primary -##################################################### - -### router/200_exim4-config_primary -################################# -# This file holds the primary router, responsible for nonlocal mails - -.ifdef DCconfig_internet -# configtype=internet -# -# deliver mail to the recipient if recipient domain is a domain we -# relay for. We do not ignore any target hosts here since delivering to -# a site local or even a link local address might be wanted here, and if -# such an address has found its way into the MX record of such a domain, -# the local admin is probably in a place where that broken MX record -# could be fixed. - -dnslookup_relay_to_domains: - debug_print = "R: dnslookup_relay_to_domains for $local_part@$domain" - driver = dnslookup - domains = ! +local_domains : +relay_to_domains - transport = remote_smtp - same_domain_copy_routing = yes - no_more - -# deliver mail directly to the recipient. This router is only reached -# for domains that we do not relay for. Since we most probably can't -# have broken MX records pointing to site local or link local IP -# addresses fixed, we ignore target hosts pointing to these addresses. - -dnslookup: - debug_print = "R: dnslookup for $local_part@$domain" - driver = dnslookup - domains = !+mlmmj_domains : !+local_domains - transport = remote_smtp - same_domain_copy_routing = yes - # ignore private rfc1918 and APIPA addresses - ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8 : 192.168.0.0/16 :\ - 172.16.0.0/12 : 10.0.0.0/8 : 169.254.0.0/16 :\ - 255.255.255.255 - no_more - -.endif - - -.ifdef DCconfig_local -# configtype=local -# -# Stand-alone system, so generate an error for mail to a non-local domain -nonlocal: - debug_print = "R: nonlocal for $local_part@$domain" - driver = redirect - domains = ! +local_domains - allow_fail - data = :fail: Mailing to remote domains not supported - no_more - -.endif - - -.ifdef DCconfig_smarthost DCconfig_satellite -# configtype=smarthost or configtype=satellite -# -# Send all non-local mail to a single other machine (smarthost). -# -# This means _ALL_ non-local mail goes to the smarthost. This will most -# probably not do what you want for domains that are listed in -# relay_domains. The most typical use for relay_domains is to control -# relaying for incoming e-mail on secondary MX hosts. In that case, -# it doesn't make sense to send the mail to the smarthost since the -# smarthost will probably send the message right back here, causing a -# loop. -# -# If you want to use a smarthost while being secondary MX for some -# domains, you'll need to copy the dnslookup_relay_to_domains router -# here so that mail to relay_domains is handled separately. - -smarthost: - debug_print = "R: smarthost for $local_part@$domain" - driver = manualroute - domains = ! +local_domains - transport = remote_smtp_smarthost - route_list = * DCsmarthost byname - host_find_failed = ignore - same_domain_copy_routing = yes - no_more - -.endif - - -# The "no_more" above means that all later routers are for -# domains in the local_domains list, i.e. just like Exim 3 directors. -##################################################### -### end router/200_exim4-config_primary -##################################################### -##################################################### -### router/300_exim4-config_real_local -##################################################### - -### router/300_exim4-config_real_local -################################# - -# This router allows reaching a local user while avoiding local -# processing. This can be used to inform a user of a broken .forward -# file, for example. The userforward router does this. - -COND_LOCAL_SUBMITTER = "\ - ${if match_ip{$sender_host_address}{:@[]}\ - {1}{0}\ - }" - -real_local: - debug_print = "R: real_local for $local_part@$domain" - driver = accept - domains = +local_domains - condition = COND_LOCAL_SUBMITTER - local_part_prefix = real- - check_local_user - transport = LOCAL_DELIVERY - -##################################################### -### end router/300_exim4-config_real_local -##################################################### -##################################################### -### router/400_exim4-config_system_aliases -##################################################### - -### router/400_exim4-config_system_aliases -################################# - -# This router handles aliasing using a traditional /etc/aliases file. -# -##### NB You must ensure that /etc/aliases exists. It used to be the case -##### NB that every Unix had that file, because it was the Sendmail default. -##### NB These days, there are systems that don't have it. Your aliases -##### NB file should at least contain an alias for "postmaster". -# -# This router handles the local part in a case-insensitive way which -# satisfies the RFCs requirement that postmaster be reachable regardless -# of case. If you decide to handle /etc/aliases in a caseful way, you -# need to make arrangements for a caseless postmaster. -# -# Delivery to arbitrary directories, files, and piping to programs in -# /etc/aliases is disabled per default. -# If that is a problem for you, see -# /usr/share/doc/exim4-base/README.Debian.gz -# for explanation and some workarounds. - -system_aliases: - debug_print = "R: system_aliases for $local_part@$domain" - driver = redirect - domains = +local_domains - allow_fail - allow_defer - data = ${lookup{$local_part}lsearch{/etc/aliases}} - .ifdef SYSTEM_ALIASES_USER - user = SYSTEM_ALIASES_USER - .endif - .ifdef SYSTEM_ALIASES_GROUP - group = SYSTEM_ALIASES_GROUP - .endif - .ifdef SYSTEM_ALIASES_FILE_TRANSPORT - file_transport = SYSTEM_ALIASES_FILE_TRANSPORT - .endif - .ifdef SYSTEM_ALIASES_PIPE_TRANSPORT - pipe_transport = SYSTEM_ALIASES_PIPE_TRANSPORT - .endif - .ifdef SYSTEM_ALIASES_DIRECTORY_TRANSPORT - directory_transport = SYSTEM_ALIASES_DIRECTORY_TRANSPORT - .endif -##################################################### -### end router/400_exim4-config_system_aliases -##################################################### -##################################################### -### router/500_exim4-config_hubuser -##################################################### - -### router/500_exim4-config_hubuser -################################# - -.ifdef DCconfig_satellite -# This router is only used for configtype=satellite. -# It takes care to route all mail targetted to -# to the host where we read our mail -# -hub_user: - debug_print = "R: hub_user for $local_part@$domain" - driver = redirect - domains = +local_domains - data = ${local_part}@DCreadhost - check_local_user - -# Grab the redirected mail and deliver it. -# This is a duplicate of the smarthost router, needed because -# DCreadhost might end up as part of +local_domains -hub_user_smarthost: - debug_print = "R: hub_user_smarthost for $local_part@$domain" - driver = manualroute - domains = DCreadhost - transport = remote_smtp_smarthost - route_list = * DCsmarthost byname - host_find_failed = ignore - same_domain_copy_routing = yes - check_local_user -.endif - - -##################################################### -### end router/500_exim4-config_hubuser -##################################################### -##################################################### -### router/600_exim4-config_userforward -##################################################### - -### router/600_exim4-config_userforward -################################# - -# This router handles forwarding using traditional .forward files in users' -# home directories. It also allows mail filtering with a forward file -# starting with the string "# Exim filter" or "# Sieve filter". -# -# The no_verify setting means that this router is skipped when Exim is -# verifying addresses. Similarly, no_expn means that this router is skipped if -# Exim is processing an EXPN command. -# -# The check_ancestor option means that if the forward file generates an -# address that is an ancestor of the current one, the current one gets -# passed on instead. This covers the case where A is aliased to B and B -# has a .forward file pointing to A. -# -# The four transports specified at the end are those that are used when -# forwarding generates a direct delivery to a directory, or a file, or to a -# pipe, or sets up an auto-reply, respectively. -# -userforward: - debug_print = "R: userforward for $local_part@$domain" - driver = redirect - domains = +local_domains - check_local_user - file = $home/.forward - require_files = $local_part:$home/.forward - no_verify - no_expn - check_ancestor - allow_filter - forbid_smtp_code = true - directory_transport = address_directory - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - skip_syntax_errors - syntax_errors_to = real-$local_part@$domain - syntax_errors_text = \ - This is an automatically generated message. An error has\n\ - been found in your .forward file. Details of the error are\n\ - reported below. While this error persists, you will receive\n\ - a copy of this message for every message that is addressed\n\ - to you. If your .forward file is a filter file, or if it is\n\ - a non-filter file containing no valid forwarding addresses,\n\ - a copy of each incoming message will be put in your normal\n\ - mailbox. If a non-filter file contains at least one valid\n\ - forwarding address, forwarding to the valid addresses will\n\ - happen, and those will be the only deliveries that occur. - -##################################################### -### end router/600_exim4-config_userforward -##################################################### -##################################################### -### router/700_exim4-config_procmail -##################################################### - -procmail: - debug_print = "R: procmail for $local_part@$domain" - driver = accept - domains = +local_domains - check_local_user - transport = procmail_pipe - # emulate OR with "if exists"-expansion - require_files = ${local_part}:\ - ${if exists{/etc/procmailrc}\ - {/etc/procmailrc}{${home}/.procmailrc}}:\ - +/usr/bin/procmail - no_verify - no_expn - -##################################################### -### end router/700_exim4-config_procmail -##################################################### -##################################################### -### router/800_exim4-config_maildrop -##################################################### - -### router/800_exim4-config_maildrop -################################# - -maildrop: - debug_print = "R: maildrop for $local_part@$domain" - driver = accept - domains = +local_domains - check_local_user - transport = maildrop_pipe - require_files = ${local_part}:${home}/.mailfilter:+/usr/bin/maildrop - no_verify - no_expn - -##################################################### -### end router/800_exim4-config_maildrop -##################################################### -##################################################### -### router/850_exim4-config_lowuid -##################################################### - -### router/850_exim4-config_lowuid -################################# - -.ifndef FIRST_USER_ACCOUNT_UID -FIRST_USER_ACCOUNT_UID = 0 -.endif - -.ifndef DEFAULT_SYSTEM_ACCOUNT_ALIAS -DEFAULT_SYSTEM_ACCOUNT_ALIAS = :fail: no mail to system accounts -.endif - -COND_SYSTEM_USER_AND_REMOTE_SUBMITTER = "\ - ${if and{{! match_ip{$sender_host_address}{:@[]}}\ - {<{$local_user_uid}{FIRST_USER_ACCOUNT_UID}}}\ - {1}{0}\ - }" - -lowuid_aliases: - debug_print = "R: lowuid_aliases for $local_part@$domain (UID $local_user_uid)" - check_local_user - driver = redirect - allow_fail - domains = +local_domains - condition = COND_SYSTEM_USER_AND_REMOTE_SUBMITTER - data = ${if exists{CONFDIR/lowuid-aliases}\ - {${lookup{$local_part}lsearch{CONFDIR/lowuid-aliases}\ - {$value}{DEFAULT_SYSTEM_ACCOUNT_ALIAS}}}\ - {DEFAULT_SYSTEM_ACCOUNT_ALIAS}} -##################################################### -### end router/850_exim4-config_lowuid -##################################################### -##################################################### -### router/900_exim4-config_local_user -##################################################### - -### router/900_exim4-config_local_user -################################# - -# This router matches local user mailboxes. If the router fails, the error -# message is "Unknown user". - -local_user: - debug_print = "R: local_user for $local_part@$domain" - driver = accept - domains = +local_domains - check_local_user - local_parts = ! root - transport = LOCAL_DELIVERY - cannot_route_message = Unknown user -##################################################### -### end router/900_exim4-config_local_user -##################################################### -##################################################### -### router/mmm_mail4root -##################################################### - -### router/mmm_mail4root -################################# -# deliver mail addressed to root to /var/mail/mail as user mail:mail -# if it was not redirected in /etc/aliases or by other means -# Exim cannot deliver as root since 4.24 (FIXED_NEVER_USERS) - -mail4root: - debug_print = "R: mail4root for $local_part@$domain" - driver = redirect - domains = +local_domains - data = /var/mail/mail - file_transport = address_file - local_parts = root - user = mail - group = mail - -##################################################### -### end router/mmm_mail4root -##################################################### -##################################################### -### transport/00_exim4-config_header -##################################################### - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -# ORDER DOES NOT MATTER # -# Only one appropriate transport is called for each delivery. # -###################################################################### - -# A transport is used only when referenced from a router that successfully -# handles an address. - -begin transports - -mlmmj_transport: - driver = pipe - return_path_add - user = mlmmj - group = mlmmj - home_directory = MLMMJ_HOME - current_directory = MLMMJ_HOME - command = /usr/bin/mlmmj-footer-receive MLMMJ_HOME ${lc:$local_part} - -##################################################### -### end transport/00_exim4-config_header -##################################################### -##################################################### -### transport/10_exim4-config_transport-macros -##################################################### - -### transport/10_exim4-config_transport-macros -################################# - -.ifdef HIDE_MAILNAME -REMOTE_SMTP_HEADERS_REWRITE=*@+local_domains $1@DCreadhost frs : *@ETC_MAILNAME $1@DCreadhost frs -REMOTE_SMTP_RETURN_PATH=${if match_domain{$sender_address_domain}{+local_domains}{${sender_address_local_part}@DCreadhost}{${if match_domain{$sender_address_domain}{ETC_MAILNAME}{${sender_address_local_part}@DCreadhost}fail}}} -.endif - -.ifdef REMOTE_SMTP_HELO_FROM_DNS -.ifdef REMOTE_SMTP_HELO_DATA -REMOTE_SMTP_HELO_DATA==${lookup dnsdb {ptr=$sending_ip_address}{$value}{$primary_hostname}} -.else -REMOTE_SMTP_HELO_DATA=${lookup dnsdb {ptr=$sending_ip_address}{$value}{$primary_hostname}} -.endif -.endif -##################################################### -### end transport/10_exim4-config_transport-macros -##################################################### -##################################################### -### transport/30_exim4-config_address_file -##################################################### - -# This transport is used for handling deliveries directly to files that are -# generated by aliasing or forwarding. -# -address_file: - debug_print = "T: address_file for $local_part@$domain" - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -##################################################### -### end transport/30_exim4-config_address_file -##################################################### -##################################################### -### transport/30_exim4-config_address_pipe -##################################################### - -# This transport is used for handling pipe deliveries generated by -# .forward files. If the commands fails and produces any output on standard -# output or standard error streams, the output is returned to the sender -# of the message as a delivery error. -address_pipe: - debug_print = "T: address_pipe for $local_part@$domain" - driver = pipe - return_fail_output - -##################################################### -### end transport/30_exim4-config_address_pipe -##################################################### -##################################################### -### transport/30_exim4-config_address_reply -##################################################### - -# This transport is used for handling autoreplies generated by the filtering -# option of the userforward router. -# -address_reply: - debug_print = "T: autoreply for $local_part@$domain" - driver = autoreply - -##################################################### -### end transport/30_exim4-config_address_reply -##################################################### -##################################################### -### transport/30_exim4-config_mail_spool -##################################################### - -### transport/30_exim4-config_mail_spool - -# This transport is used for local delivery to user mailboxes in traditional -# BSD mailbox format. -# -mail_spool: - debug_print = "T: appendfile for $local_part@$domain" - driver = appendfile - file = /var/mail/$local_part - delivery_date_add - envelope_to_add - return_path_add - group = mail - mode = 0660 - mode_fail_narrower = false - -##################################################### -### end transport/30_exim4-config_mail_spool -##################################################### -##################################################### -### transport/30_exim4-config_maildir_home -##################################################### - -### transport/30_exim4-config_maildir_home -################################# - -# Use this instead of mail_spool if you want to to deliver to Maildir in -# home-directory - change the definition of LOCAL_DELIVERY -# -maildir_home: - debug_print = "T: maildir_home for $local_part@$domain" - driver = appendfile - .ifdef MAILDIR_HOME_MAILDIR_LOCATION - directory = MAILDIR_HOME_MAILDIR_LOCATION - .else - directory = $home/Maildir - .endif - .ifdef MAILDIR_HOME_CREATE_DIRECTORY - create_directory - .endif - .ifdef MAILDIR_HOME_CREATE_FILE - create_file = MAILDIR_HOME_CREATE_FILE - .endif - delivery_date_add - envelope_to_add - return_path_add - maildir_format - .ifdef MAILDIR_HOME_DIRECTORY_MODE - directory_mode = MAILDIR_HOME_DIRECTORY_MODE - .else - directory_mode = 0700 - .endif - .ifdef MAILDIR_HOME_MODE - mode = MAILDIR_HOME_MODE - .else - mode = 0600 - .endif - mode_fail_narrower = false - # This transport always chdirs to $home before trying to deliver. If - # $home is not accessible, this chdir fails and prevents delivery. - # If you are in a setup where home directories might not be - # accessible, uncomment the current_directory line below. - # current_directory = / -##################################################### -### end transport/30_exim4-config_maildir_home -##################################################### -##################################################### -### transport/30_exim4-config_maildrop_pipe -##################################################### - -maildrop_pipe: - debug_print = "T: maildrop_pipe for $local_part@$domain" - driver = pipe - path = "/bin:/usr/bin:/usr/local/bin" - command = "/usr/bin/maildrop" - message_prefix = - message_suffix = - return_path_add - delivery_date_add - envelope_to_add - -##################################################### -### end transport/30_exim4-config_maildrop_pipe -##################################################### -##################################################### -### transport/30_exim4-config_procmail_pipe -##################################################### - -procmail_pipe: - debug_print = "T: procmail_pipe for $local_part@$domain" - driver = pipe - path = "/bin:/usr/bin:/usr/local/bin" - command = "/usr/bin/procmail" - return_path_add - delivery_date_add - envelope_to_add - -##################################################### -### end transport/30_exim4-config_procmail_pipe -##################################################### -##################################################### -### transport/30_exim4-config_remote_smtp -##################################################### - -### transport/30_exim4-config_remote_smtp -################################# -# This transport is used for delivering messages over SMTP connections. - -remote_smtp: - debug_print = "T: remote_smtp for $local_part@$domain" - driver = smtp -.ifdef REMOTE_SMTP_HOSTS_AVOID_TLS - hosts_avoid_tls = REMOTE_SMTP_HOSTS_AVOID_TLS -.endif -.ifdef REMOTE_SMTP_HEADERS_REWRITE - headers_rewrite = REMOTE_SMTP_HEADERS_REWRITE -.endif -.ifdef REMOTE_SMTP_RETURN_PATH - return_path = REMOTE_SMTP_RETURN_PATH -.endif -.ifdef REMOTE_SMTP_HELO_DATA - helo_data=REMOTE_SMTP_HELO_DATA -.endif -.ifdef DKIM_DOMAIN -dkim_domain = DKIM_DOMAIN -.endif -.ifdef DKIM_SELECTOR -dkim_selector = DKIM_SELECTOR -.endif -.ifdef DKIM_PRIVATE_KEY -dkim_private_key = DKIM_PRIVATE_KEY -.endif -.ifdef DKIM_CANON -dkim_canon = DKIM_CANON -.endif -.ifdef DKIM_STRICT -dkim_strict = DKIM_STRICT -.endif -.ifdef DKIM_SIGN_HEADERS -dkim_sign_headers = DKIM_SIGN_HEADERS -.endif -.ifdef TLS_DH_MIN_BITS -tls_dh_min_bits = TLS_DH_MIN_BITS -.endif -.ifdef REMOTE_SMTP_TLS_CERTIFICATE -tls_certificate = REMOTE_SMTP_TLS_CERTIFICATE -.endif -.ifdef REMOTE_SMTP_PRIVATEKEY -tls_privatekey = REMOTE_SMTP_PRIVATEKEY -.endif -##################################################### -### end transport/30_exim4-config_remote_smtp -##################################################### -##################################################### -### transport/30_exim4-config_remote_smtp_smarthost -##################################################### - -### transport/30_exim4-config_remote_smtp_smarthost -################################# - -# This transport is used for delivering messages over SMTP connections -# to a smarthost. The local host tries to authenticate. -# This transport is used for smarthost and satellite configurations. - -remote_smtp_smarthost: - debug_print = "T: remote_smtp_smarthost for $local_part@$domain" - driver = smtp - hosts_try_auth = <; ${if exists{CONFDIR/passwd.client} \ - {\ - ${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$host_address}}\ - }\ - {} \ - } -.ifdef REMOTE_SMTP_SMARTHOST_HOSTS_AVOID_TLS - hosts_avoid_tls = REMOTE_SMTP_SMARTHOST_HOSTS_AVOID_TLS -.endif -.ifdef REMOTE_SMTP_HEADERS_REWRITE - headers_rewrite = REMOTE_SMTP_HEADERS_REWRITE -.endif -.ifdef REMOTE_SMTP_RETURN_PATH - return_path = REMOTE_SMTP_RETURN_PATH -.endif -.ifdef REMOTE_SMTP_HELO_DATA - helo_data=REMOTE_SMTP_HELO_DATA -.endif -.ifdef TLS_DH_MIN_BITS -tls_dh_min_bits = TLS_DH_MIN_BITS -.endif -.ifdef REMOTE_SMTP_SMARTHOST_TLS_CERTIFICATE -tls_certificate = REMOTE_SMTP_SMARTHOST_TLS_CERTIFICATE -.endif -.ifdef REMOTE_SMTP_SMARTHOST_PRIVATEKEY -tls_privatekey = REMOTE_SMTP_SMARTHOST_PRIVATEKEY -.endif -##################################################### -### end transport/30_exim4-config_remote_smtp_smarthost -##################################################### -##################################################### -### transport/35_exim4-config_address_directory -##################################################### -# This transport is used for handling file addresses generated by alias -# or .forward files if the path ends in "/", which causes it to be treated -# as a directory name rather than a file name. - -address_directory: - debug_print = "T: address_directory for $local_part@$domain" - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - check_string = "" - escape_string = "" - maildir_format - -##################################################### -### end transport/35_exim4-config_address_directory -##################################################### -##################################################### -### retry/00_exim4-config_header -##################################################### - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### - -begin retry - -##################################################### -### end retry/00_exim4-config_header -##################################################### -##################################################### -### retry/30_exim4-config -##################################################### - -### retry/30_exim4-config -################################# - -# This single retry rule applies to all domains and all errors. It specifies -# retries every 15 minutes for 2 hours, then increasing retry intervals, -# starting at 1 hour and increasing each time by a factor of 1.5, up to 16 -# hours, then retries every 6 hours until 4 days have passed since the first -# failed delivery. - -# Please note that these rules only limit the frequency of retries, the -# effective retry-time depends on the frequency of queue-running, too. -# See QUEUEINTERVAL in /etc/default/exim4. - -# Address or Domain Error Retries -# ----------------- ----- ------- - -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - -##################################################### -### end retry/30_exim4-config -##################################################### -##################################################### -### rewrite/00_exim4-config_header -##################################################### - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### - -begin rewrite - -##################################################### -### end rewrite/00_exim4-config_header -##################################################### -##################################################### -### rewrite/31_exim4-config_rewriting -##################################################### - -### rewrite/31_exim4-config_rewriting -################################# - -# This rewriting rule is particularily useful for dialup users who -# don't have their own domain, but could be useful for anyone. -# It looks up the real address of all local users in a file -.ifndef NO_EAA_REWRITE_REWRITE -*@+local_domains "${lookup{${local_part}}lsearch{/etc/email-addresses}\ - {$value}fail}" Ffrs -# identical rewriting rule for /etc/mailname -*@ETC_MAILNAME "${lookup{${local_part}}lsearch{/etc/email-addresses}\ - {$value}fail}" Ffrs -.endif - - -##################################################### -### end rewrite/31_exim4-config_rewriting -##################################################### -##################################################### -### auth/00_exim4-config_header -##################################################### - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### - -begin authenticators - - -##################################################### -### end auth/00_exim4-config_header -##################################################### -##################################################### -### auth/30_exim4-config_examples -##################################################### - -### auth/30_exim4-config_examples -################################# - -# The examples below are for server side authentication, when the -# local exim is SMTP server and clients authenticate to the local exim. - -# They allow two styles of plain-text authentication against an -# CONFDIR/passwd file whose syntax is described in exim4_passwd(5). - -# Hosts that are allowed to use AUTH are defined by the -# auth_advertise_hosts option in the main configuration. The default is -# "*", which allows authentication to all hosts over all kinds of -# connections if there is at least one authenticator defined here. -# Authenticators which rely on unencrypted clear text passwords don't -# advertise on unencrypted connections by default. Thus, it might be -# wise to set up TLS to allow encrypted connections. If TLS cannot be -# used for some reason, you can set AUTH_SERVER_ALLOW_NOTLS_PASSWORDS to -# advertise unencrypted clear text password based authenticators on all -# connections. As this is severely reducing security, using TLS is -# preferred over allowing clear text password based authenticators on -# unencrypted connections. - -# PLAIN authentication has no server prompts. The client sends its -# credentials in one lump, containing an authorization ID (which we do not -# use), an authentication ID, and a password. The latter two appear as -# $auth2 and $auth3 in the configuration and should be checked against a -# valid username and password. In a real configuration you would typically -# use $auth2 as a lookup key, and compare $auth3 against the result of the -# lookup, perhaps using the crypteq{}{} condition. - -# plain_server: -# driver = plaintext -# public_name = PLAIN -# server_condition = "${if crypteq{$auth3}{${extract{1}{:}{${lookup{$auth2}lsearch{CONFDIR/passwd}{$value}{*:*}}}}}{1}{0}}" -# server_set_id = $auth2 -# server_prompts = : -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif - -# LOGIN authentication has traditional prompts and responses. There is no -# authorization ID in this mechanism, so unlike PLAIN the username and -# password are $auth1 and $auth2. Apart from that you can use the same -# server_condition setting for both authenticators. - -# login_server: -# driver = plaintext -# public_name = LOGIN -# server_prompts = "Username:: : Password::" -# server_condition = "${if crypteq{$auth2}{${extract{1}{:}{${lookup{$auth1}lsearch{CONFDIR/passwd}{$value}{*:*}}}}}{1}{0}}" -# server_set_id = $auth1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif -# -# cram_md5_server: -# driver = cram_md5 -# public_name = CRAM-MD5 -# server_secret = ${extract{2}{:}{${lookup{$auth1}lsearch{CONFDIR/passwd}{$value}fail}}} -# server_set_id = $auth1 - -# Here is an example of CRAM-MD5 authentication against PostgreSQL: -# -# psqldb_auth_server: -# driver = cram_md5 -# public_name = CRAM-MD5 -# server_secret = ${lookup pgsql{SELECT pw FROM users WHERE username = '${quote_pgsql:$auth1}'}{$value}fail} -# server_set_id = $auth1 - -# Authenticate against local passwords using sasl2-bin -# Requires exim_uid to be a member of sasl group, see README.Debian.gz -# plain_saslauthd_server: -# driver = plaintext -# public_name = PLAIN -# server_condition = ${if saslauthd{{$auth2}{$auth3}}{1}{0}} -# server_set_id = $auth2 -# server_prompts = : -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif -# -# login_saslauthd_server: -# driver = plaintext -# public_name = LOGIN -# server_prompts = "Username:: : Password::" -# # don't send system passwords over unencrypted connections -# server_condition = ${if saslauthd{{$auth1}{$auth2}}{1}{0}} -# server_set_id = $auth1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif -# -# ntlm_sasl_server: -# driver = cyrus_sasl -# public_name = NTLM -# server_realm = -# server_set_id = $auth1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif -# -# digest_md5_sasl_server: -# driver = cyrus_sasl -# public_name = DIGEST-MD5 -# server_realm = -# server_set_id = $auth1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif - -# Authentcate against cyrus-sasl -# This is mainly untested, please report any problems to -# pkg-exim4-users@lists.alioth.debian.org. -# cram_md5_sasl_server: -# driver = cyrus_sasl -# public_name = CRAM-MD5 -# server_realm = -# server_set_id = $auth1 -# -# plain_sasl_server: -# driver = cyrus_sasl -# public_name = PLAIN -# server_realm = -# server_set_id = $auth1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif -# -# login_sasl_server: -# driver = cyrus_sasl -# public_name = LOGIN -# server_realm = -# server_set_id = $auth1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif - -# Authenticate against courier authdaemon - -# This is now the (working!) example from -# http://www.exim.org/eximwiki/FAQ/Policy_controls/Q0730 -# Possible pitfall: access rights on /var/run/courier/authdaemon/socket. -# plain_courier_authdaemon: -# driver = plaintext -# public_name = PLAIN -# server_condition = \ -# ${extract {ADDRESS} \ -# {${readsocket{/var/run/courier/authdaemon/socket} \ -# {AUTH ${strlen:exim\nlogin\n$auth2\n$auth3\n}\nexim\nlogin\n$auth2\n$auth3\n} }} \ -# {yes} \ -# fail} -# server_set_id = $auth2 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif - -# login_courier_authdaemon: -# driver = plaintext -# public_name = LOGIN -# server_prompts = Username:: : Password:: -# server_condition = \ -# ${extract {ADDRESS} \ -# {${readsocket{/var/run/courier/authdaemon/socket} \ -# {AUTH ${strlen:exim\nlogin\n$auth1\n$auth2\n}\nexim\nlogin\n$auth1\n$auth2\n} }} \ -# {yes} \ -# fail} -# server_set_id = $auth1 -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif - -# This one is a bad hack to support the broken version 4.xx of -# Microsoft Outlook Express which violates the RFCs by demanding -# "250-AUTH=" instead of "250-AUTH ". -# If your list of offered authenticators is other than PLAIN and LOGIN, -# you need to adapt the public_name line manually. -# It has to be the last authenticator to work and has not been tested -# well. Use at your own risk. -# See the thread entry point from -# http://www.exim.org/mail-archives/exim-users/Week-of-Mon-20050214/msg00213.html -# for the related discussion on the exim-users mailing list. -# Thanks to Fred Viles for this great work. - -# support_broken_outlook_express_4_server: -# driver = plaintext -# public_name = "\r\n250-AUTH=PLAIN LOGIN" -# server_prompts = User Name : Password -# server_condition = no -# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} -# .endif - -############## -# See /usr/share/doc/exim4-base/README.Debian.gz -############## - -# These examples below are the equivalent for client side authentication. -# They get the passwords from CONFDIR/passwd.client, whose format is -# defined in exim4_passwd_client(5) - -# Because AUTH PLAIN and AUTH LOGIN send the password in clear, we -# only allow these mechanisms over encrypted connections by default. -# You can set AUTH_CLIENT_ALLOW_NOTLS_PASSWORDS to allow unencrypted -# clear text password authentication on all connections. - -cram_md5: - driver = cram_md5 - public_name = CRAM-MD5 - client_name = ${extract{1}{:}{${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$value}fail}}} - client_secret = ${extract{2}{:}{${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$value}fail}}} - -# this returns the matching line from passwd.client and doubles all ^ -PASSWDLINE=${sg{\ - ${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$value}fail}\ - }\ - {\\N[\\^]\\N}\ - {^^}\ - } - -plain: - driver = plaintext - public_name = PLAIN -.ifndef AUTH_CLIENT_ALLOW_NOTLS_PASSWORDS - client_send = "<; ${if !eq{$tls_out_cipher}{}\ - {^${extract{1}{:}{PASSWDLINE}}\ - ^${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}\ - }fail}" -.else - client_send = "<; ^${extract{1}{:}{PASSWDLINE}}\ - ^${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}" -.endif - -login: - driver = plaintext - public_name = LOGIN -.ifndef AUTH_CLIENT_ALLOW_NOTLS_PASSWORDS - # Return empty string if not non-TLS AND looking up $host in passwd-file - # yields a non-empty string; fail otherwise. - client_send = "<; ${if and{\ - {!eq{$tls_out_cipher}{}}\ - {!eq{PASSWDLINE}{}}\ - }\ - {}fail}\ - ; ${extract{1}{::}{PASSWDLINE}}\ - ; ${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}" -.else - # Return empty string if looking up $host in passwd-file yields a - # non-empty string; fail otherwise. - client_send = "<; ${if !eq{PASSWDLINE}{}\ - {}fail}\ - ; ${extract{1}{::}{PASSWDLINE}}\ - ; ${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}" -.endif -##################################################### -### end auth/30_exim4-config_examples -##################################################### diff --git a/misc/move/exim4.filter b/misc/move/exim4.filter deleted file mode 100644 index 4f87a5b..0000000 --- a/misc/move/exim4.filter +++ /dev/null @@ -1,2 +0,0 @@ -if $message_body contains "DISCARD_THIS_MAIL" and not error_message -then seen finish endif diff --git a/misc/move/foot_filter/Makefile b/misc/move/foot_filter/Makefile deleted file mode 100644 index eb22bc9..0000000 --- a/misc/move/foot_filter/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -all: foot_filter -dev: tags splint foot_filter -.PHONY: splint clean clobber -tags: foot_filter.c - ctags --excmd=number '--regex-c=-/\*[[:blank:]]*tag:[[:blank:]]*([[:alnum:]_]+)-\1-' foot_filter.c -splint: - splint +unixlib -exitarg -initallelements foot_filter.c -foot_filter: foot_filter.c - gcc -Wall -g -o foot_filter foot_filter.c -O3 -clean: - -rm tags -clobber: clean - -rm foot_filter - -rm test diff --git a/misc/move/foot_filter/foot_filter.c b/misc/move/foot_filter/foot_filter.c deleted file mode 100644 index 6bbbff7..0000000 --- a/misc/move/foot_filter/foot_filter.c +++ /dev/null @@ -1,2685 +0,0 @@ -/* - -foot_filter.c - -(C) 2010 Ben Schmidt - -This Source Code Form is subject to the terms of the Mozilla Public License -Version 2.0. If a copy of the MPL was not distributed with this file, You can -obtain one at http://mozilla.org/MPL/2.0/. - -*/ - -// Check out the -V option; it outputs this and more -#define FOOT_FILTER_VERSION "foot_filter version 1.2, (C) 2010 Ben Schmidt" - -static const char * USAGE="\n\ -usage: foot_filter [-p plain_footer_file] [-h html_footer_file]\n\ - [{-P|-H} mime_footer_file] [-s]\n\ - foot_filter -V\n\ -\n\ -plain_footer_file, if present, will be appended to mails with plain text\n\ -sections only. Similarly, html_footer_file. If mime_footer_file (either\n\ -plain, -P, or HTML, -H) is given, it will be used when a mail with\n\ -alternative formats is encountered, or if the footer for the relevant\n\ -type of mail is not present; a new MIME section will be added.\n\ -\n\ --s turns on smart mode which endeavours to remove included/quoted copies of\n\ -the (or a similar) footer by surrounding the footer with patterns it later\n\ -recognises. It also endeavours to strip 'padding' surrounding the old\n\ -footers to make things as clean as possible. This includes whitespace\n\ -(including ' ' and '
'), '>' quoting characters, various pairs of\n\ -HTML tags (p, blockquote, div, span, font; it's naive, it doesn't check\n\ -tags in between are balanced at all, so in '

prefix

suffix

' the\n\ -first and last tags are paired), and even horizontal rules when inside\n\ -paired tags (e.g. use '
footer
'). If the smart strings are\n\ -found in the footer, they won't be added by the program, so you have the\n\ -necessary control to do this.\n\ -\n\ -New footers are added prior to trailing whitespace and a few closing html\n\ -tags (body, html) as well. You almost certainly want to begin your footer\n\ -with an empty line because of this.\n\ -\n\ -Since these alterations, by their very nature, break signed mail,\n\ -signatures are removed while processing. To keep some value from signatures,\n\ -have the MTA verify them and add a header (or even supply an alternative\n\ -footer to this program), and resign them to authenticate they came from the\n\ -mailing list directly after the signature verification was done and recorded.\n\ -Or don't use these kinds of transformations at all.\n\ -\n\ --V shows the version and exits.\n\ -\n\ -Program is running now. Send EOF or interrupt to stop it. To avoid this usage\n\ -message if wanting to run without arguments, use '--' as an argument.\n\ -\n"; - -/* - -This is a fairly simple program not expecting much extension. As such, some -liberties have been taken and some fun has been had by the author. Correctness -has been prioritised in design, but speed and efficiency have been taken into -consideration and prioritised above readability and modularity and other such -generally recommended programming practices. If making changes, great care -should be taken to understand how and where (everywhere) globals are used -before making them. Don't try to modify the program without understanding how -the whole thing works together or you will get burnt. You have been warned. - -Relevant RFCs: -http://www.ietf.org/rfc/rfc2015.txt -http://www.ietf.org/rfc/rfc3851.txt -http://www.ietf.org/rfc/rfc2045.txt -http://www.ietf.org/rfc/rfc2046.txt -http://www.ietf.org/rfc/rfc822.txt -http://www.ietf.org/rfc/rfc2183.txt - -For program configuration, see the 'constants' section below. - -Also see code comments throughout. - -Future possibilities: - -- Saving copies of original mail in 'semi-temp' files for debugging. - -- Stripping attachments and save them (e.g. in a location that can become a - 'files uploaded' section on a website). Replace them with links to the - website, even. - -- Making the prefixes, suffixes, replacements, padding, guts, pairs, - configurable at runtime. - -- Attaching signed mail, or wrapping in a multipart rather than removing - signatures; wouldn't be hard if always using MIME footers. - -- Following a script to allow various other header transformations (addition, - removal, etc.), or other transformations. - -- Prologues as well as or instead of footers. - -*/ - -/* tag: includes */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* tag: typedefs */ - -// splint has bools, but C doesn't! -#ifndef S_SPLINT_S -typedef int bool; -#define false (0) -#define true (1) -#endif - -// This is mostly to be able to include splint annotations -typedef /*@null@*//*@observer@*/ const char * const_null_string; -typedef /*@null@*/ char * null_string; -typedef /*@null@*//*@owned@*/ char * owned_null_string; -typedef /*@null@*//*@dependent@*/ char * dependent_null_string; - -// 'Callbacks'; they communicate primarily using globals, see below -typedef bool (*callback_t)(); -typedef void (*function_t)(); - -// For fill() -typedef enum { - echo, - encode, - shunt, - discard, - stop, - fail -} when_full_t; - -// Various places -typedef enum { - unencoded, - quoted_printable, - base64 -} encoding_t; - -// For returning multiple characters, and a request to delete backlog -// when decoding -typedef struct { - int r; - int c1; - int c2; - int c3; -} decode_t; - -/* tag: constants */ - -/* tag: header_constants */ - -// How many MIME Content- headers we expect, maximum, in a mail. If we have -// more than that, we won't be able to process MIME so well, but we won't fail -// catastrophically. -#define mime_headers_max 16 - -/* tag: footer_constants */ - -// Stuff for processing the footer's smart removal and (smart or not) -// insertion - -static const char * plain_prefix = "------~----------"; -static const char * plain_suffix = "------~~---------"; -static const char * plain_replacement = "\r\n\r\n"; -static const_null_string plain_tails[] = { - " ","\t","\r","\n", - NULL -}; -static const_null_string plain_padding[] = { - ">"," ","\t","\r","\n", - NULL -}; -static const_null_string plain_guts[] = { - NULL -}; -static const_null_string plain_pairs[] = { - NULL -}; - -static const char * html_prefix = "------~----------"; -static const char * html_suffix = "------~~---------"; -static const char * html_replacement = "\r\n

\r\n"; -static const_null_string html_tails[] = { - "","","","", - " "," ","&NBSP;","\t","\r","\n", - "
","
","
","
","
","
", - NULL -}; -static const_null_string html_padding[] = { - ">",">", - " "," ","&NBSP;","\t","\r","\n", - "
","
","
","
","
","
", - NULL -}; -static const_null_string html_guts[] = { - // These are removed in an attempt to make a pair - "
","
","
","
","
","
", - " "," ","&NBSP;","\t","\r","\n", - "
","
","
","
","
","
", - NULL -}; -static const_null_string html_pairs[] = { - // Closing part (or NULL to mark no more), end of opening part, - // start of opening part, NULL - // The search strategy is fairly naive; if it finds the closing part, - // it checks for the end of the opening part; if it finds that, it - // searches back for the first character of each of the opening part - // variants, and if that character is found and is the beginning of the - // whole variant, it removes the pair. - "

",">","

","

",">","

","

",">","

","
",">","
","
",">","
","
",">","
","
",">","","",">","","",">","","",">","","0,"unexpected commandline argument"); - // Load footers - if (plain_footer_file!=NULL) - load_footer(&plain_footer,&plain_footer_buffer, - plain_footer_file, - smart_footer?plain_prefix:NULL,smart_footer?plain_suffix:NULL); - if (html_footer_file!=NULL) - load_footer(&html_footer,&html_footer_buffer, - html_footer_file, - smart_footer?html_prefix:NULL,smart_footer?html_suffix:NULL); - if (mime_footer_file!=NULL) - load_footer(&mime_footer,&mime_footer_buffer, - mime_footer_file,NULL,NULL); - // Do the job - process_section(true,true,NULL); - // Finish - if (plain_footer_buffer!=NULL) free(plain_footer_buffer); - if (html_footer_buffer!=NULL) free(html_footer_buffer); - if (mime_footer_buffer!=NULL) free(mime_footer_buffer); - exit(EX_OK); -} - -static void load_footer(/*@out@*//*@shared@*/ char ** footer, - /*@reldef@*/ char ** footer_buffer, - char * file, - /*@unique@*/ const_null_string prefix, - /*@unique@*/ const_null_string suffix) { - FILE * f; - int prefixl=0, footerl=0, suffixl=0; - char * ff; - if (prefix!=NULL&&suffix!=NULL) { - prefixl=(int)strlen(prefix); - suffixl=(int)strlen(suffix); - } - f=fopen(file,"r"); - resort_to_errno(f==NULL,"error opening footer file",EX_NOINPUT); - resort_to_errno(fseek(f,0,SEEK_END)!=0, - "error seeking end of footer file",EX_IOERR); - resort_to_errno((footerl=(int)ftell(f))==-1, - "error finding footer length",EX_IOERR); - resort_to_errno(fseek(f,0,SEEK_SET)!=0, - "error seeking in footer file",EX_IOERR); - // prefix, \n, footer, \n, suffix, \0 - *footer_buffer=alloc_or_exit(sizeof(char)*(prefixl+footerl+suffixl+3)); - *footer=*footer_buffer; - *footer+=prefixl+1; - resort_to_errno(fread(*footer,1,(size_t)footerl,f)<(size_t)footerl, - "error reading footer",EX_IOERR); - // We strip off a single trailing newline to keep them from accumulating - // but to allow the user the option of adding them if desired - if ((*footer)[footerl-1]=='\n') --footerl; - (*footer)[footerl]='\0'; - if (prefix==NULL||suffix==NULL) return; - // Put in the prefix and suffix as necessary - ff=strstr(*footer,prefix); - if (ff!=NULL) { - ff=strstr(ff,suffix); - if (ff!=NULL) return; - (*footer)[footerl]='\n'; - ++footerl; - strcpy(*footer+footerl,suffix); - (*footer)[footerl+suffixl]='\0'; - } else { - ff=strstr(*footer,suffix); - if (ff==NULL) { - (*footer)[footerl]='\n'; - ++footerl; - strcpy(*footer+footerl,suffix); - (*footer)[footerl+suffixl]='\0'; - } - *footer-=prefixl+1; - strcpy(*footer,prefix); - (*footer)[prefixl]='\n'; - } -} - -// Should be called with the boundary for the section as lookahead -// in the buffer, but nothing more, and no lookbehind. -static void process_section(bool add_footer, - bool can_reenvelope, /*@null@*/ bool * parent_needs_footer) { - char * external=NULL; - char * internal=NULL; - char * generated=NULL; - bool reenveloping=false; - bool child_needed_footer=false; - bool needs_footer=false; - bool unsigning=false; - if (parent_needs_footer!=NULL) *parent_needs_footer=false; - // The headers must be read, saved and echoed before making any - // recursive calls, as I'm naughty and using globals. - read_boundary(&external); - read_and_save_mime_headers(); - if (mime_bad) { - // If an error, just resort to echoing - echo_buffer(); // Boundary and headers - // End headers with the extra line break - resort_to_errno(putstr("\r\n")==EOF, - "error echoing string",EX_IOERR); - free_saved_mime_headers(); - // Body - echo_to_boundary(external); - free(external); - return; - } - // Headers determining we skip this section - if (is_signature()) { - skip_buffer(); // Boundary and headers - skip_to_boundary(external); - return; - } - // Header processing - if (is_signed()) unsigning=true; - if (unsigning) change_to_mixed(); - if (add_footer&&mime_footer!=NULL&&( - is_alternative()||(is_multipart(NULL)&&!is_mixed())|| - (is_plain()&&plain_footer==NULL)|| - (is_html()&&html_footer==NULL) - )) { - add_footer=false; - if (can_reenvelope) { - reenveloping=true; - remove_mime_headers(); - } else if (parent_needs_footer!=NULL) *parent_needs_footer=true; - } - // Headers - echo_buffer(); // Boundary and possibly modified headers - if (reenveloping) { - generate_boundary(&generated); - output_mime_mixed_headers(generated); - output_prolog(); - output_boundary(generated); - output_saved_mime_headers(); - } - // End the headers with the extra line break - resort_to_errno(putstr("\r\n")==EOF, - "error echoing string",EX_IOERR); - // Body processing - if (is_multipart(&internal)) { - // This branch frees the MIME headers before recursing. - // Don't include the prolog if it used to be signed; - // it usually says something like 'this message is signed' - if (unsigning) { - skip_to_boundary(internal); - resort_to_errno(putstr("\r\n")==EOF, - "error echoing string",EX_IOERR); - } else { - echo_to_boundary(internal); - } - // The recursive call needs these globals - free_saved_mime_headers(); - while (!at_final_boundary(internal)) { - process_section(add_footer,false,&child_needed_footer); - if (child_needed_footer) needs_footer=true; - } - if (needs_footer) output_mime_footer(internal); - free(internal); - echo_to_boundary(external); - } else { - // This branch frees the MIME headers at the end - if (!is_attachment()&&( - (is_plain()&&plain_footer!=NULL)|| - (is_html()&&html_footer!=NULL))) { - // alternatively - // if (!is_attachment()&&( - // (is_plain()&&((add_footer&&plain_footer!=NULL)||smart_footer))|| - // (is_html()&&((add_footer&&html_footer!=NULL)||smart_footer)))) { - if (is_plain()) { - process_text_section(add_footer,plain_footer, - plain_prefix,plain_suffix,plain_replacement, - plain_tails,plain_padding,plain_guts,plain_pairs,external); - } else { - process_text_section(add_footer,html_footer, - html_prefix,html_suffix,html_replacement, - html_tails,html_padding,html_guts,html_pairs,external); - } - } else { - echo_to_boundary(external); - } - free_saved_mime_headers(); - } - // MIME stuff is freed now; take care not to use it. - /*@-branchstate@*/ - if (reenveloping) { - // We ensure generated is not null in another if(reenveloping) - // conditional above - /*@-nullpass@*/ - output_mime_footer(generated); - output_final_boundary(generated); - free(generated); - /*@=nullpass@*/ - } - /*@=branchstate@*/ - free(external); -} - -/* tag: header_functions */ - -static inline void read_and_save_mime_headers() { - /*@-mustfreeonly@*/ - mime_bad=false; - // Mark current end of buffer - buffer_mark=buffer_read; - buffer_marked=true; - for (;;) { - do { - // Extend current header until beginning of next - callback_bool=false; - (void)fill(until_eol,shunt); - if (buffer_filled==buffer_read) { - // We probably hit EOF; just get out, and the whole - // mail will end up echoed out - warning("unexpected end of input"); - break; - } - (void)look(one_char,buffer_read,false); - if (callback_int==(int)' '||callback_int==(int)'\t') { - // Continuation of previous header; read it - read_buffer(); - continue; - } - // Start of new header; don't read it; process the old one - // (from the mark to the end of the lookbehind) - break; - } while (true); - // Process the old header, if there is one - if (buffer_mark0) { - if (*h=='\0') break; - if (*h=='\\') { - ++h; - if (*h=='\0') break; - } - else if (*h=='(') ++levels; - else if (*h==')') --levels; - ++h; - } - if (!delimiting(*h,ext)&&!delimiting(*(hh-1),ext)) { - // Put in some whitespace if something delimiting isn't - // coming and hasn't just been - *hh=' '; - ++hh; - } - continue; - } else if (*h=='"'||*h=='[') { - if (*h=='[') close=']'; - else close='"'; - *hh=*h; - ++h; ++hh; - hhh=hh; - while (*h!='\0'&&*h!=close) { - if (*h=='\\') { - *hh=*h; - ++hh; ++h; - if (*h=='\0') break; - if (*h=='\r'&&*(h+1)=='\n') { - *hh=*h; ++hh; ++h; - *hh=*h; ++hh; ++h; - if (*h=='\0') break; - ++hh; ++h; - continue; - } - } else if (*h==(char)8) { - --hh; ++h; - if (hh'||c=='@'|| - c==','||c==';'||c==':'||c=='\\'||c=='"'|| - c=='.'||c=='['||c==']'|| - (ext&&(c=='/'||c=='='||c=='?'))); -} -static inline void remove_mime_headers() { - int h; - for (h=0;h0, - "internal error: unexpected data in buffer",EX_SOFTWARE); - set_decoding_type(); - encoding=decoding; - decode_and_read_to_boundary_encoding_when_full(boundary); - if (smart_footer&&footer!=NULL) { - // alternatively - // if (smart_footer) { - for (;;) { - prefix_pos=pos_of(prefix,0,buffer_read); - if (prefix_pos==EOF) break; - suffix_pos=pos_of(suffix,prefix_pos,buffer_read); - if (suffix_pos==EOF) break; - for (;;) { - later_prefix_pos= - pos_of(prefix,prefix_pos+prefixl,suffix_pos-prefixl); - if (later_prefix_pos!=EOF) prefix_pos=later_prefix_pos; - else break; - } - suffix_pos+=suffixl; - pad(padding,guts,pairs,&prefix_pos,&suffix_pos); - replacement_starts[replacements_count]=prefix_pos; - replacement_ends[replacements_count]=suffix_pos; - // We may not want the last replacement so replace - // with nothing first - replacement_strings[replacements_count]=NULL; - ++replacements_count; - // We want the last replacement; encode it now before - // doing any more encoding - if (removed_footers) encode_string(replacement); - encode_replacements(); - removed_footers=true; - } - } - if (*boundary!='\0'&&(decoding==quoted_printable||decoding==unencoded)) { - // If we're not using base64 encoding, and we're in multipart, there - // will be a final CRLF that is part of the input but logically part of - // the boundary, not the text. Removing the footer may have already - // removed it, so we need to check if it's here or not. - if (buffer_read>1) { - callback_compare="\r\n"; - (void)look(comparing_head,buffer_read-2,false); - callback_compare=NULL; - if (callback_bool) boundary_newline=true; - } - } - if (add_footer&&footer!=NULL) { - // This will skip past the boundary newline - mark_tail(tails); - if (removed_footers&&buffer_mark==0) { - // The last replacement coincides with where the footer - // is going to go; don't use the replacement text. - removed_footers=false; - } - } - if (removed_footers) encode_string(replacement); - if (add_footer&&footer!=NULL) { - if (buffer_mark0) (void)empty(until_no_buffer); -} -static inline void echo_lookbehind() { - make_replacements(echoing_one_char,echoing_until_start_marked); - if (buffer_read>0) (void)empty(echoing_until_no_lookbehind); -} -static inline void encode_lookbehind() { - make_replacements(encoding_one_char,encoding_until_start_marked); - if (buffer_read>0) (void)empty(encoding_until_no_lookbehind); -} -static inline void encode_replacements() { - make_replacements(encoding_one_char,encoding_until_start_marked); -} -static inline void make_replacements(callback_t one_char, - callback_t start_marked) { - int r, minr=0; - const char * c; - if (buffer_read==0) return; - buffer_marked=false; - while (replacements_count>0) { - for (r=0;r0) (void)empty(start_marked); - c = replacement_strings[minr]; - if (c!=NULL) { - while (*c!='\0') { - buffer_char=(int)(unsigned int)*c; - (void)(*one_char)(); - ++c; - } - } - buffer_marked=true; - buffer_mark=replacement_ends[minr]; - for (r=0;r0) (void)empty(until_start_marked); - for (r=minr;r0) (void)empty(encoding_until_start_marked); -} -static inline void echo_disk_buffer() { - if (disk_buffer_filled>0) (void)empty(echoing_until_no_disk_buffer); -} -static inline void encode_disk_buffer() { - if (disk_buffer_filled>0) (void)empty(encoding_until_no_disk_buffer); -} -static inline void skip_disk_buffer() { - if (disk_buffer_filled>0) (void)empty(until_no_disk_buffer); -} -static inline void read_boundary(/*@out@*/ char ** boundary) { - int l=0; - if (buffer_filled>buffer_read) { - callback_bool=false; - callback_int=0; - resort_to_exit(!look(counting_until_eol,buffer_read,false), - "internal error: missing eol at section boundary",EX_SOFTWARE); - l=callback_int-2; // remove the CRLF, but keep the leading '--' - } - // Leave room to append a trailing '--' for testing final boundary; - // the CRLF will be written in this space by saving_until_eol too. - *boundary = alloc_or_exit(sizeof(char)*(l+3)); - if (buffer_filled>buffer_read) { - callback_bool=false; - callback_save=*boundary; - (void)look(saving_until_eol,buffer_read,false); - callback_save=NULL; - } - (*boundary)[l]='\0'; - if (buffer_filled>buffer_read) { - callback_bool=false; - (void)look(until_eol,buffer_read,true); - } -} -static inline void echo_to_boundary(const char * boundary) { - do { - echo_buffer(); - } while (!process_one_line_checking_boundary( - echoing_n_chars,NULL,until_eol,echo,boundary)); -} -static inline void skip_to_boundary(const char * boundary) { - do { - skip_buffer(); - } while (!process_one_line_checking_boundary( - n_chars,NULL,until_eol,discard,boundary)); -} -static inline void decode_and_read_to_boundary_encoding_when_full( - const char * boundary) { - do { - read_buffer(); - } while (!process_one_line_checking_boundary( - encoding_n_chars,decode_lookahead, - decoding_until_eol,encode,boundary)); - finish_decoding(); // This just sets state, doesn't change data -} -static inline bool process_one_line_checking_boundary(callback_t n_chars, - /*@null@*/ function_t process, callback_t processing, - when_full_t when_full, const char * boundary) { - bool stopped_by_design; - if (feof(stdin)!=0) { - // We're done! Call it a boundary (even if it isn't--we need to - // get out of loops cleanly and tidy up as best we can). - return true; - } - // Empty until enough space for boundary - if (mem_buffer_size-mem_buffer_filled<80) { - callback_int=80-(mem_buffer_size-mem_buffer_filled); - (void)empty(n_chars); - } - callback_bool=false; - stopped_by_design=fill(until_eol,stop); - if (stopped_by_design||feof(stdin)!=0) { - if (buffer_filled-buffer_read==0) { - return *boundary=='\0'; - } - callback_bool=false; - if (*boundary!='\0') { - // Can only be at a boundary without being at EOF if there - // really is a boundary - /*@-temptrans@*/ - callback_compare=boundary; - /*@=temptrans@*/ - (void)look(comparing_head,buffer_read,false); - callback_compare=NULL; - } - if (!callback_bool&&process!=NULL) (*process)(); - return callback_bool; - } else { - // Line is too long to be a boundary, so must be decoded - if (process!=NULL) (*process)(); - callback_bool=false; - (void)fill(processing,when_full); - return false; - } -} - -// Return the position of text whose start may occur in the buffer -// anywhere between from and (just before) to. Use EOF for from to -// go from current location; use EOF for to to read indefinitely; -// EOF is returned if text is not found. -static int pos_of(const char * text,int from,int to) { - int saved_buffer_read; - int pos=EOF; - if (*text=='\0') return from; - saved_buffer_read=buffer_read; - if (from!=EOF) buffer_read=from; - callback_match=(int)(unsigned int)*text; - for (;;) { - if (to!=EOF) { - callback_int=to-buffer_read; - if (!look(n_chars_until_match,buffer_read,true)) break; - } else { - if (!look(until_match,buffer_read,true)) break; - } - if (!callback_bool) break; - /*@-temptrans@*/ - callback_compare=text+1; - /*@=temptrans@*/ - (void)look(comparing_head,buffer_read,false); - callback_compare=NULL; - if (callback_bool) { - // Include the first character - pos=buffer_read-1; - break; - } - } - buffer_read=saved_buffer_read; - return pos; -} - -// Look at characters in the buffer, starting at offset from, -// 'reading' if so indicated (and looking at that location). -// The callback is called after updating the reading pointer -// and placing the character in the buffer. The character is -// also passed by means of the buffer_char global. -// EOF is sent to the callback when we run out of data. -// There is no automatic attempt to fill the buffer. -// The callback should return a boolean indicating whether -// to continue. This function will return true if the callback -// indicated to stop (including if it so indicated on EOF), or -// false if it stopped for EOF. -// We always call the callback at least once, so don't call -// this function at all unless you definitely want to look -// at something. -static bool look(callback_t callback,int from,bool read) { - int pos=from; - int disk_buffer_pos; - char * mem_buffer_pos; - if (pos=mem_buffer_end) mem_buffer_pos-=mem_buffer_size; - while (pos=disk_buffer_filled) { - mem_buffer_pos=mem_buffer_next_empty+(pos-disk_buffer_filled); - if (mem_buffer_pos>=mem_buffer_end) mem_buffer_pos-=mem_buffer_size; - while (pos>=disk_buffer_filled) { - buffer_char=(int)(unsigned int)*mem_buffer_pos; - if (!(*callback)()) return true; - --mem_buffer_pos; - if (mem_buffer_pos==mem_buffer_start-1) - mem_buffer_pos=mem_buffer_end-1; - if (mark&&pos==buffer_mark) --buffer_mark; - --pos; - } - } - if (pos>=0&&disk_buffer_filled>0) { - disk_buffer_pos=disk_buffer_start+pos; - // Reading backwards in the disk buffer is potentially very nasty; - // hopefully it never actually happens - while (pos>=0) { - /*@-nullpass@*/ - resort_to_errno(fseek(disk_buffer,disk_buffer_pos,SEEK_SET)!=0, - "error seeking in temporary file",EX_IOERR); - disk_buffer_sought=disk_buffer_pos; - buffer_char=getc(disk_buffer); - /*@=nullpass@*/ - resort_to_errno(buffer_char==EOF, - "error reading temporary file",EX_IOERR); - ++disk_buffer_sought; - if (!(*callback)()) return true; - --disk_buffer_pos; - if (mark&&pos==buffer_mark) --buffer_mark; - --pos; - } - } - if (mark&&buffer_mark==-1) { - buffer_mark=0; - buffer_marked=false; - } - // We don't call the callback on EOF when going backwards - // buffer_char=EOF; - // (void)(*callback)(); - return false; -} -// Remove characters from the (beginning of the) buffer. The same -// general principles as for look() apply. The callback is called -// after the character is removed and all accounting has been done, so -// perhaps the only place you can reliably find the character is in -// the buffer_char global. Again the callback gets an EOF call if -// there's nothing more to empty, and no automatic filling is done. -// The callback and function return values are as for look() and -// again, the callback is always called at least once; this means at -// least one character is always removed from the buffer, so only call -// the function if something definitely should be removed. -static bool empty(callback_t callback) { - if (disk_buffer_filled>0) { - if (disk_buffer_sought!=disk_buffer_start) { - /*@-nullpass@*/ - resort_to_errno(fseek(disk_buffer,disk_buffer_start,SEEK_SET)!=0, - "error seeking in temporary file",EX_IOERR); - /*@=nullpass@*/ - disk_buffer_sought=disk_buffer_start; - } - while (disk_buffer_filled>0) { - /*@-nullpass@*/ - buffer_char=getc(disk_buffer); - /*@=nullpass@*/ - resort_to_errno(buffer_char==EOF, - "error reading temporary file",EX_IOERR); - ++disk_buffer_sought; - ++disk_buffer_start; - --disk_buffer_filled; - --buffer_filled; - if (buffer_read>0) --buffer_read; - if (buffer_marked) { - if (buffer_mark>0) --buffer_mark; - else buffer_marked=false; - } - if (!(*callback)()) return true; - } - } - while (mem_buffer_filled>0) { - buffer_char=(int)(unsigned int)*mem_buffer_next_empty; - ++mem_buffer_next_empty; - if (mem_buffer_next_empty==mem_buffer_end) mem_buffer_next_empty=mem_buffer_start; - --mem_buffer_filled; - --buffer_filled; - if (buffer_read>0) --buffer_read; - if (buffer_marked) { - if (buffer_mark>0) --buffer_mark; - else buffer_marked=false; - } - if (!(*callback)()) return true; - } - buffer_char=EOF; - if (!(*callback)()) return true; - return false; -} -// Get more characters into the (end of the) buffer. The same -// general principles as for look() apply. The callback is called -// after the character is added and all accounting has been done, -// gets the character via buffer_char, including an EOF when no more -// input is available (EOF on stdin). It should return whether to get -// more characters, and this function will return whether its exit was -// requested by the callback or not (the callback may signal EOF is -// an appropriate place to stop and we still return true). -// When the buffer is full there are a number of automatic options -// echo old the data to stdout or call encodechar for it one character -// at a time; shunt a block off to disk, keeping mem_buffer_keep in -// memory, discard it a character at a time, stop (and return false; -// no EOF call is made), or fail (exit). Here 'full' is defined as -// less than mem_buffer_margin of space after adding the most recent -// character, so there is always a bit of space for callbacks to do -// input transformations. Again, at least one character is always -// added (if possible), and thus consumed from stdin, so only call this -// if you really want to do that. -static bool fill(callback_t callback, when_full_t when_full) { - if (feof(stdin)!=0) { - buffer_char=EOF; - if (!(*callback)()) return true; - return false; - } - for (;;) { - /*@-infloops@*/ - while (mem_buffer_filled>=mem_buffer_size-mem_buffer_margin) { - switch (when_full) { - case echo: - if (disk_buffer_filled>0) echo_disk_buffer(); - (void)empty(echoing_one_char); - break; - case encode: - if (disk_buffer_filled>0) encode_disk_buffer(); - (void)empty(encoding_one_char); - break; - case discard: - if (disk_buffer_filled>0) skip_disk_buffer(); - (void)empty(one_char); - break; - case shunt: - shunt_to_disk(mem_buffer_filled-mem_buffer_keep); - break; - case stop: - return false; - case fail: default: - resort_to_exit(true,"buffer full",EX_SOFTWARE); - } - } - /*@=infloops@*/ - buffer_char=get(); - if (buffer_char==EOF) { - resort_to_errno(ferror(stdin)!=0,"error reading input",EX_IOERR); - if (!(*callback)()) return true; - return false; - } - *mem_buffer_next_fill=(char)buffer_char; - ++mem_buffer_next_fill; - if (mem_buffer_next_fill==mem_buffer_end) mem_buffer_next_fill=mem_buffer_start; - ++mem_buffer_filled; - ++buffer_filled; - if (!(*callback)()) return true; - } -} - -static inline void create_disk_buffer() { - int fildes; - fildes=mkstemp(disk_buffer_template); - resort_to_errno(fildes==-1, - "cannot create temporary file",EX_CANTCREAT); - disk_buffer=fdopen(fildes,"rw"); - resort_to_errno(disk_buffer==NULL, - "cannot create temporary stream",EX_CANTCREAT); -} -static void remove_disk_buffer() { - if (disk_buffer!=NULL) { - resort_to_warning(fclose(disk_buffer)!=0, - "error closing temporary file"); - disk_buffer=NULL; - resort_to_warning(unlink(disk_buffer_template)!=0, - "error removing temporary file"); - } -} -static inline void shunt_to_disk(int n) { - if (disk_buffer==NULL) create_disk_buffer(); - if (disk_buffer_sought!=disk_buffer_start+disk_buffer_filled) { - disk_buffer_sought=disk_buffer_start+disk_buffer_filled; - /*@-nullpass@*/ - resort_to_errno(fseek(disk_buffer, - disk_buffer_start+disk_buffer_filled,SEEK_SET)!=0, - "cannot seek to end of temporary file",EX_IOERR); - /*@=nullpass@*/ - } - while (n>0) { - resort_to_exit(mem_buffer_filled==0, - "internal error: shunting too much to disk",EX_SOFTWARE); - /*@-nullpass@*/ - resort_to_errno(putc(*mem_buffer_next_empty,disk_buffer)==EOF, - "error writing to temporary file",EX_IOERR); - /*@=nullpass@*/ - ++disk_buffer_sought; - ++disk_buffer_filled; - ++mem_buffer_next_empty; - if (mem_buffer_next_empty==mem_buffer_end) mem_buffer_next_empty=mem_buffer_start; - --mem_buffer_filled; - --n; - } -} - -/* tag: callback_functions */ - -static bool one_char() { - callback_int=buffer_char; - return false; -} -static bool echoing_one_char() { - if (buffer_char!=EOF) { - resort_to_errno(put(buffer_char)==EOF,"error echoing",EX_IOERR); - } - callback_int=buffer_char; - return false; -} -static bool encoding_one_char() { - if (buffer_char!=EOF) encodechar(buffer_char); - callback_int=buffer_char; - return false; -} -// Set up callback_int before using this. -static bool n_chars() { - return --callback_int>0; -} -// Set up callback_int before using this. -static bool echoing_n_chars() { - if (buffer_char!=EOF) { - resort_to_errno(put(buffer_char)==EOF,"error echoing",EX_IOERR); - } - return --callback_int>0; -} -// Set up callback_int before using this. -static bool encoding_n_chars() { - if (buffer_char!=EOF) encodechar(buffer_char); - return --callback_int>0; -} -// Set up callback_int and callback_save before using this. -static bool saving_n_chars() { - if (buffer_char!=EOF) *callback_save++=(char)buffer_char; - // We don't actually need this, though it's a good idea, really! - // *callback_save='\0'; - return --callback_int>0; -} -// Set up callback_int and callback_match before using this. -static bool n_chars_until_match() { - callback_bool=buffer_char==callback_match; - return --callback_int>0&&buffer_char!=callback_match; -} -// Do callback_bool=false before using this. -static bool until_eol() { - if (buffer_char==(int)'\n') return !callback_bool; - callback_bool=buffer_char==(int)'\r'; - return true; -} -// Do callback_bool=false before using this. -/*static bool echoing_until_eol() { - if (buffer_char!=EOF) { - resort_to_errno(put(buffer_char)==EOF,"error echoing",EX_IOERR); - } - if (buffer_char==(int)'\n') return !callback_bool; - callback_bool=buffer_char==(int)'\r'; - return true; -}*/ -// Do callback_bool=false, callback_int=0 before using this. -static bool counting_until_eol() { - if (buffer_char!=EOF) ++callback_int; - if (buffer_char==(int)'\n') return !callback_bool; - callback_bool=buffer_char==(int)'\r'; - return true; -} -// Do callback_bool=false and set up callback_save before using this. -static bool saving_until_eol() { - if (buffer_char!=EOF) *callback_save++=(char)buffer_char; - // We don't actually need this, though it's a good idea, really! - // *callback_save='\0'; - if (buffer_char==(int)'\n') return !callback_bool; - callback_bool=buffer_char==(int)'\r'; - return true; -} -// Do callback_bool=false before using this. -static bool decoding_until_eol() { - // We decode as we fill and work directly in the buffer to make - // the transformation. We are guaranteed enough space to do this by - // mem_buffer_margin. - decode_t decoded; - decoded=decodechar(buffer_char); - // We always remove the latest undecoded character from the - // buffer. - ++decoded.r; - if (decoded.r>mem_buffer_filled) { - // This will only happen for quoted-printable decoding - // whitespace stripping, and we can just live with it - // if we can't get rid of it all; with sensible constants - // something really is disobeying MIME and probably SMTP - // about line length anyway if this happens. - warning("unable to strip all whitespace; not enough in memory"); - decoded.r=mem_buffer_filled; - } - if (buffer_filled-decoded.r(int)'Z'||c2!=c1-(int)'A'+(int)'a')&& - (c2<(int)'A'||c2>(int)'Z'||c1!=c2-(int)'A'+(int)'a')) { - callback_bool=false; - return false; - } - /*@-modobserver@*/ - ++callback_compare; - /*@=modobserver@*/ - if (*callback_compare=='\0') { - callback_bool=true; - return false; - } - return true; - /*@=nullderef@*/ -} - -/* tag: encoding_functions */ - -static inline void encode_string(const char * s) { - while (*s!='\0') { - encodechar((int)(unsigned int)*s); - s++; - } -} -static void encodechar(int c) { - if (encoding==unencoded) { - if (c!=EOF) resort_to_errno(put(c)==EOF,"error encoding",EX_IOERR); - return; - } else if (encoding==quoted_printable) { - if (encoding_echoed>=68) { - // We need a soft line break, or are close enough to needing - // one (76 chars max; unclear whether that counts the CRLF; and - // we may output two 3 character sequences which we don't want - // to follow with an unescaped CRLF). This scheme will probably - // make mail look a bit awful, but that's fairly standard anyway, - // and it shouldn't degrade. - resort_to_errno(putstr("=\r\n")==EOF, - "error encoding string",EX_IOERR); - encoding_echoed=0; - } - if (encoding_filled==1) { - // Whatever happens, we'll deal with this now - encoding_filled=0; - if (encoding_buffer[0]=='\r') { - if (c==(int)'\n') { - // Output them as is and we're done for now - resort_to_errno(putstr("\r\n")==EOF, - "error encoding string",EX_IOERR); - encoding_echoed=0; - return; - } else { - // Must encode the bare CR and continue as normal - resort_to_errno(put((int)'=')==EOF,"error encoding",EX_IOERR); - encode_hex_byte((unsigned int)'\r'); - encoding_echoed+=3; - } - } else { - // encoding_buffer[0] must be whitespace - if (c==EOF||c==(int)'\r') { - // Must encode it - resort_to_errno(put((int)'=')==EOF,"error encoding",EX_IOERR); - encode_hex_byte((unsigned int)encoding_buffer[0]); - encoding_echoed+=3; - } else { - // It is fine to output it now as something else is coming - resort_to_errno(put( - (int)(unsigned int)encoding_buffer[0])==EOF, - "error encoding",EX_IOERR); - encoding_echoed+=1; - } - } - } - if ((c>=33&&c<=60)||(c>=62&&c<=126)) { - resort_to_errno(put(c)==EOF,"error encoding",EX_IOERR); - ++encoding_echoed; - } else if (c==(int)' '||c==(int)'\t') { - if (encoding_echoed>=55) { - // My concession to readability; since it's likely to be - // a big mess with a 68 character width, we might as well - // break a bit earlier on a nice word boundary. And it'll - // in fact look better if we break with roughly equal size - // lines, assuming they come in at close to 76 characters - // wide, so we might as well make a nice skinny column. - // rather than a ragged one that uses the same amount of - // space. Compromising between the two, then, as some - // formats, like HTML, don't have many hard line breaks - // anyway, is what we get. - resort_to_errno(put(c)==EOF,"error encoding",EX_IOERR); - resort_to_errno(putstr("=\r\n")==EOF, - "error encoding string",EX_IOERR); - encoding_echoed=0; - } else { - // Store it; we may need to encode it if it's at end of line - encoding_filled=1; - encoding_buffer[0]=(char)c; - } - } else if (c==(int)'\r') { - // Store it; '\n' may be coming up - encoding_filled=1; - encoding_buffer[0]='\r'; - } else if (c==EOF) { - // No buffer, and we're done! Reset for another run. - encoding_echoed=0; - } else { - // Anything else must be encoded as a sequence. - resort_to_errno(put((int)'=')==EOF,"error encoding",EX_IOERR); - encode_hex_byte((unsigned int)c); - encoding_echoed+=3; - } - } else if (encoding==base64) { - if (c==EOF) { - // Reset for next run; we won't need it here - encoding_echoed=0; - if (encoding_filled==0) return; - encoding_buffer[encoding_filled]='\0'; - } else { - encoding_buffer[encoding_filled++]=(char)c; - } - if (encoding_filled==3||c==EOF) { - encode_64((((unsigned int)encoding_buffer[0]>>2)&0x3f)); - encode_64((((unsigned int)encoding_buffer[0]&0x03)<<4)| - (((unsigned int)encoding_buffer[1]>>4)&0x0f)); - if (encoding_filled==1) { - resort_to_errno(put((int)'=')==EOF,"error encoding",EX_IOERR); - resort_to_errno(put((int)'=')==EOF,"error encoding",EX_IOERR); - // Reset for next run - encoding_filled=0; - return; - } - encode_64((((unsigned int)encoding_buffer[1]&0x0f)<<2)| - (((unsigned int)encoding_buffer[2]>>6)&0x03)); - if (encoding_filled==2) { - resort_to_errno(put((int)'=')==EOF,"error encoding",EX_IOERR); - // Reset for next run - encoding_filled=0; - return; - } - encode_64((((unsigned int)encoding_buffer[2]&0x3f))); - encoding_echoed+=4; - if (encoding_echoed>=72) { - resort_to_errno(putstr("\r\n")==EOF, - "error encoding string",EX_IOERR); - encoding_echoed=0; - } - encoding_filled=0; - } - } else { - resort_to_exit(true,"internal error: unknown encoding",EX_SOFTWARE); - } -} -static inline void finish_encoding() { - encodechar(EOF); -} -// The function takes an input character c and returns up to four output -// characters (a character will be EOF to indicate no further characters -// to store; note that this doesn't mean there will be no more ever; only -// if EOF is returned when EOF was input does it meant this), and a number -// of characters to remove before adding the aforementioned characters. -static decode_t decodechar(int c) { - int h; - unsigned int b1, b2, b3, b4; - decode_t o; - o.r=0; o.c1=EOF; o.c2=EOF; o.c3=EOF; - if (decoding==unencoded) { - o.c1=c; - return o; - } else if (decoding==quoted_printable) { - // decoding_buffer may hold '=' and maybe a hex digit or a CR. - if (decoding_filled==2) { - // Whatever happens, it's all settled now. - decoding_filled=0; - if (decoding_buffer[1]=='\r') { - if (c==(int)'\n') { return o; } - // Invalid; leave as is--will be encoded later. - o.c1=(int)'='; o.c2=(int)'\r'; o.c3=c; - return o; - } - h=decode_hex(c); - if (h==EOF) { - // Invalid; leave as is--will be encoded later. - o.c1=(int)'='; o.c2=(int)(unsigned int)decoding_buffer[1]; o.c3=c; - return o; - } - // We have a full sequence representing a single character. - o.c1=decode_hex((int)(unsigned int)decoding_buffer[1])*16+h; - return o; - } else if (decoding_filled==1) { - if (c==(int)'\r'||decode_hex(c)!=EOF) { - // Valid character after = - decoding_filled=2; - decoding_buffer[1]=(char)c; - return o; - } - // Invalid; leave as is--will be encoded later. - decoding_filled=0; - o.c1=(int)'='; o.c2=c; - return o; - } else if (decoding_filled==0) { - if (c==(int)'=') { - // The first character can only ever be '=' so we - // don't actually bother to store it; just say it's there. - decoding_white=0; - decoding_filled=1; - return o; - } - // Keep track of whitespace. - if (c==(int)' '||c==(int)'\t') ++decoding_white; - else decoding_white=0; - // Remove trailing whitespace. - if (c==EOF||c==(int)'\r') { o.r=decoding_white; decoding_white=0; } - // Otherwise we just keep it. If it's EOF, we're done. - o.c1=c; - return o; - } else { - warning("internal error: decoding buffer too full"); - return o; - } - } else if (decoding==base64) { - if (c==EOF) { - // Just in case it was corrupted, make sure we're reset - decoding_filled=0; - return o; - } - if (c==(int)'='||decode_64(c)!=EOF) - decoding_buffer[decoding_filled++]=(char)c; - if (decoding_filled==4) { - // We empty it whatever happens here - decoding_filled=0; - b1=(unsigned int)decode_64((int)decoding_buffer[0]); - b2=(unsigned int)decode_64((int)decoding_buffer[1]); - o.c1=(int)(((b1&0x3f)<<2)|((b2>>4)&0x03)); - if (decoding_buffer[2]=='=') return o; - b3=(unsigned int)decode_64((int)decoding_buffer[2]); - o.c2=(int)(((b2&0x0f)<<4)|((b3>>2)&0x0f)); - if (decoding_buffer[3]=='=') return o; - b4=(unsigned int)decode_64((int)decoding_buffer[3]); - o.c3=(int)(((b3&0x03)<<6)|(b4&0x3f)); - } - return o; - } else { - resort_to_exit(true,"internal error: unknown encoding",EX_SOFTWARE); - // Never reached - return o; - } -} -static void decode_lookahead() { - // Decoding will always shrink, so this is quite easy - char * c; - char * cc; - decode_t decoded; - int pos=buffer_read; - int decpos=buffer_read; - resort_to_exit(buffer_read=mem_buffer_end) c-=mem_buffer_size; - cc=c; - while (pos0) { - resort_to_exit(decpos-decoded.r=(int)'0'&&c<=(int)'9') return c-(int)'0'; - if (c>=(int)'A'&&c<=(int)'F') return c-(int)'A'+10; - return EOF; -} -static inline int decode_64(int c) { - if (c>=(int)'A'&&c<=(int)'Z') return c-(int)'A'; - if (c>=(int)'a'&&c<=(int)'z') return c-(int)'a'+26; - if (c>=(int)'0'&&c<=(int)'9') return c-(int)'0'+52; - if (c==(int)'+') return 62; - if (c==(int)'/') return 63; - // if (c==(int)'=') return EOF; - return EOF; -} -static inline void encode_hex_byte(unsigned int h) { - int h1=(int)((h>>4)&0x0f); - int h2=(int)(h&0x0f); - if (h1<10) resort_to_errno(put((int)'0'+h1)==EOF,"error encoding",EX_IOERR); - else if (h1<16) - resort_to_errno(put((int)'A'+h1-10)==EOF,"error encoding",EX_IOERR); - else resort_to_exit(true,"internal error: byte too large",EX_SOFTWARE); - if (h2<10) resort_to_errno(put((int)'0'+h2)==EOF,"error encoding",EX_IOERR); - else if (h2<16) - resort_to_errno(put((int)'A'+h2-10)==EOF,"error encoding",EX_IOERR); - else resort_to_exit(true,"internal error: byte too large",EX_SOFTWARE); -} -static inline void encode_64(unsigned int b) { - if (b<26) - resort_to_errno(put((int)'A'+b)==EOF,"error encoding",EX_IOERR); - else if (b<52) - resort_to_errno(put((int)'a'+b-26)==EOF,"error encoding",EX_IOERR); - else if (b<62) - resort_to_errno(put((int)'0'+b-52)==EOF,"error encoding",EX_IOERR); - else if (b==62) - resort_to_errno(put((int)'+')==EOF,"error encoding",EX_IOERR); - else if (b==63) - resort_to_errno(put((int)'/')==EOF,"error encoding",EX_IOERR); - else resort_to_exit(true, - "internal error: base64 value too large",EX_SOFTWARE); -} - -/* tag: error_functions */ - -// Syslog constants: -// level: LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG -// facility: LOG_MAIL, LOG_DAEMON, LOG_USER, LOG_LOCALn(0-7) - -static inline void * alloc_or_exit(size_t s) /*@allocates result@*/ { - void * m; - m=malloc(s); - if (m==NULL) { -#ifdef USE_STDERR - fprintf(stderr,"foot_filter: %s\n","out of memory"); -#endif -#ifdef USE_SYSLOG - syslog(LOG_ERR|LOG_MAIL,"%s\n","out of memory"); -#endif - exit(EX_OSERR); - } - return m; -} -static inline void /*noreturnwhentrue*/ - resort_to_exit(bool when,const char * message,int status) { - if (when) { -#ifdef USE_STDERR - fprintf(stderr,"foot_filter: %s\n",message); -#endif -#ifdef USE_SYSLOG - syslog(LOG_ERR|LOG_MAIL,"%s\n",message); -#endif - exit(status); - } -} -static inline void /*noreturnwhentrue*/ - resort_to_errno(bool when,const char * message,int status) { - if (when) { -#ifdef USE_STDERR - fprintf(stderr,"foot_filter: %s (%s)\n",message,strerror(errno)); -#endif -#ifdef USE_SYSLOG - syslog(LOG_ERR|LOG_MAIL,"%s (%m)\n",message); -#endif - exit(status); - } -} -static inline void resort_to_warning(bool when,const char * message) { - if (when) warning(message); -} -static inline void warning(const char * message) { -#ifdef USE_STDERR - fprintf(stderr,"foot_filter: %s\n",message); -#endif -#ifdef USE_SYSLOG - syslog(LOG_WARNING|LOG_MAIL,"%s\n",message); -#endif -} - -/* tag: helper_functions */ - -// The program was written following all the specs using CRLF for newlines, -// but we get them from Postfix with LF only, so these wrapper functions -// do the translation in such a way that it can easily be disabled if desired. -static inline int get() { - int c; -#ifdef UNIX_EOL - static bool got_nl=false; - if (got_nl) { - got_nl=false; - return 10; - } -#endif - c=getchar(); -#ifdef UNIX_EOL - if (c==10) { - got_nl=true; - return 13; - } -#endif - return c; -} -static inline int put(int c) { -#ifdef UNIX_EOL - if (c==13) return c; -#endif - return putchar(c); -} -static inline int putstr(const char * s) { - while (*s!='\0') if (put((int)(unsigned int)*s++)==EOF) return EOF; - return 0; -} - -static inline bool case_insensitively_heads(const char * head,const char * buffer) { - const char * s1=head; - const char * s2=buffer; - for (;;) { - if (*s1=='\0') return true; /* for equality return *s2=='\0'; */ - else if (*s2=='\0') return false; - if (*s1!=*s2&& - (*s1<'A'||*s1>'Z'||*s2!=*s1-'A'+'a')&& - (*s2<'A'||*s2>'Z'||*s1!=*s2-'A'+'a')) return false; - ++s1; ++s2; - } -} - diff --git a/misc/move/mlmmj-footer-receive b/misc/move/mlmmj-footer-receive deleted file mode 100755 index 66308e3..0000000 --- a/misc/move/mlmmj-footer-receive +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# mlmmj-footer-receive -# -# Adds the footer to incoming message -# - -/usr/bin/foot_filter -P /$1/$2/control/footer-text -H /$1/$2/control/footer-html | /usr/bin/mlmmj-receive -F -L /$1/$2/ diff --git a/misc/move/screenshot_0.png b/misc/move/screenshot_0.png deleted file mode 100644 index f3a339c..0000000 Binary files a/misc/move/screenshot_0.png and /dev/null differ diff --git a/misc/move/screenshot_1.png b/misc/move/screenshot_1.png deleted file mode 100644 index 1006455..0000000 Binary files a/misc/move/screenshot_1.png and /dev/null differ diff --git a/misc/smarty/templates_en/login.tpl b/misc/smarty/templates_en/login.tpl index 59cae14..c39ca00 100644 --- a/misc/smarty/templates_en/login.tpl +++ b/misc/smarty/templates_en/login.tpl @@ -42,7 +42,7 @@ Username:
- +