+++ /dev/null
-diff -urN exim-4.02.org/src/EDITME exim-4.02/src/EDITME
---- exim-4.02.org/src/EDITME Tue Mar 26 13:02:27 2002
-+++ exim-4.02/src/EDITME Tue Mar 26 13:24:21 2002
-@@ -98,7 +98,7 @@
- # /usr/local/sbin. The installation script will try to create this directory,
- # and any superior directories, if they do not exist.
-
--BIN_DIRECTORY=/usr/exim/bin
-+BIN_DIRECTORY=/usr/bin
-
-
- #------------------------------------------------------------------------------
-@@ -113,7 +113,7 @@
- # directories if they don't exist. It will also install a default run time
- # configuration if this file does not exist.
-
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=/etc/mail/exim.conf
-
-
- #------------------------------------------------------------------------------
-@@ -126,7 +126,8 @@
- # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged. These values are compiled into the binary.
-
--EXIM_USER=
-+EXIM_UID=79
-+EXIM_GID=79
-
- # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
- # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -207,7 +208,7 @@
- # This one is special-purpose, and commonly not required, so it is not
- # included by default.
-
--# TRANSPORT_LMTP=yes
-+TRANSPORT_LMTP=yes
-
-
- #------------------------------------------------------------------------------
-@@ -216,9 +217,9 @@
- # MBX, is included only when requested. If you do not know what this is about,
- # leave these settings commented out.
-
--# SUPPORT_MAILDIR=yes
--# SUPPORT_MAILSTORE=yes
--# SUPPORT_MBX=yes
-+SUPPORT_MAILDIR=yes
-+SUPPORT_MAILSTORE=yes
-+SUPPORT_MBX=yes
-
-
- #------------------------------------------------------------------------------
-@@ -233,7 +234,7 @@
- LOOKUP_DBM=yes
- LOOKUP_LSEARCH=yes
-
--# LOOKUP_CDB=yes
-+LOOKUP_CDB=yes
- # LOOKUP_DNSDB=yes
- # LOOKUP_DSEARCH=yes
- # LOOKUP_LDAP=yes
-@@ -302,8 +303,8 @@
- # included in the Exim binary. You will then need to set up the run time
- # configuration to make use of the mechanism(s) selected.
-
--# AUTH_CRAM_MD5=yes
--# AUTH_PLAINTEXT=yes
-+AUTH_CRAM_MD5=yes
-+AUTH_PLAINTEXT=yes
- # AUTH_SPA=yes
-
-
-@@ -315,8 +316,8 @@
- # with TLS support. If you don't know what this is all about, leave these
- # settings commented out.
-
--# SUPPORT_TLS=yes
--# TLS_LIBS=-lssl -lcrypto
-+SUPPORT_TLS=yes
-+TLS_LIBS=-lssl -lcrypto
-
- # If you are running Exim as a server, note that just building it with TLS
- # support is not all you need to do. You also need to set up a suitable
-@@ -358,7 +359,7 @@
- # Once you have done this, "make install" will build the info files and
- # install them in the directory you have defined.
-
--# INFO_DIRECTORY=/usr/share/info
-+INFO_DIRECTORY=/usr/share/info
-
-
- #------------------------------------------------------------------------------
-@@ -371,7 +372,7 @@
- # %s. This will be replaced by one of the strings "main", "panic", or "reject"
- # to form the final file names. Some installations may want something like this:
-
--# LOG_FILE_PATH=/var/log/exim_%slog
-+LOG_FILE_PATH=/var/log/exim/%s.log
-
- # which results in files with names /var/log/exim_mainlog, etc. The directory
- # in which the log files are placed must exist; Exim does not try to create
-@@ -405,7 +406,7 @@
- # files. Both the name of the command and the suffix that it adds to files
- # need to be defined here. See also the EXICYCLOG_MAX configuration.
-
--COMPRESS_COMMAND=/usr/bin/gzip
-+COMPRESS_COMMAND=/bin/gzip
- COMPRESS_SUFFIX=gz
-
-
-@@ -413,7 +414,7 @@
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
-
--ZCAT_COMMAND=/usr/bin/zcat
-+ZCAT_COMMAND=/bin/zcat
-
-
- #------------------------------------------------------------------------------
-@@ -422,7 +423,7 @@
- # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
- # Perl costs quite a lot of resources. Only do this if you really need it.
-
--# EXIM_PERL=perl.o
-+EXIM_PERL=perl.o
-
-
- #------------------------------------------------------------------------------
-@@ -432,11 +433,12 @@
- # support, which is intended for use in conjunction with the SMTP AUTH
- # facilities, is included only when requested by the following setting:
-
--# SUPPORT_PAM=yes
-+SUPPORT_PAM=yes
-
- # You probably need to add -lpam to EXTRALIBS, and in some releases of
- # GNU/Linux -ldl is also needed.
-
-+EXTRALIBS=-lpam -ldl
-
- #------------------------------------------------------------------------------
- # Support for authentication via Radius is also available. The Exim support,
-@@ -529,7 +531,7 @@
- # period (for example, /usr/exim/configure.host.in.some.domain). If this file
- # does not exist, then the bare configuration file name is tried.
-
--# CONFIGURE_FILE_USE_NODE=yes
-+CONFIGURE_FILE_USE_NODE=yes
-
-
- #------------------------------------------------------------------------------
-@@ -678,7 +680,7 @@
- # (process id) to a file so that it can easily be identified. The path of the
- # file can be specified here. Some installations may want something like this:
-
--# PID_FILE_PATH=/var/lock/exim.pid
-+PID_FILE_PATH=/var/run/exim%s.pid
-
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # using the name "exim-daemon.pid".
-@@ -701,7 +703,7 @@
- # be changed here. The default is 0640 so that information from the spool is
- # available to anyone who is a member of the Exim group.
-
--# SPOOL_MODE=0640
-+SPOOL_MODE=0640
-
-
- #------------------------------------------------------------------------------
+++ /dev/null
-######################################################################
-# Runtime configuration file for Exim #
-######################################################################
-
-
-# This is a default configuration file which will operate correctly in
-# uncomplicated installations. Please see the manual for a complete list
-# of all the runtime configuration options that can be included in a
-# configuration file. There are many more than are mentioned here. The
-# manual is in the file doc/spec.txt in the Exim distribution as a plain
-# ASCII file. Other formats (PostScript, Texinfo, HTML, PDF) are available
-# from the Exim ftp sites. The manual is also online at the Exim web sites.
-
-
-# This file is divided into several parts, all but the first of which are
-# headed by a line starting with the word "begin". Only those parts that
-# are required need to be present. Blank lines, and lines starting with #
-# are ignored.
-
-
-########### IMPORTANT ########## IMPORTANT ########### IMPORTANT ###########
-# #
-# Whenever you change Exim's configuration file, you *must* remember to #
-# HUP the Exim daemon, because it will not pick up the new configuration #
-# until you do. However, any other Exim processes that are started, for #
-# example, a process started by an MUA in order to send a message, will #
-# see the new configuration as soon as it is in place. #
-# #
-# You do not need to HUP the daemon for changes in auxiliary files that #
-# are referenced from this file. They are read every time they are used. #
-# #
-# It is usually a good idea to test a new configuration for syntactic #
-# correctness before installing it (for example, by running the command #
-# "exim -C /config/file.new -bV"). #
-# #
-########### IMPORTANT ########## IMPORTANT ########### IMPORTANT ###########
-
-
-
-######################################################################
-# MAIN CONFIGURATION SETTINGS #
-######################################################################
-
-# Specify your host's canonical name here. This should normally be the fully
-# qualified "official" name of your host. If this option is not set, the
-# uname() function is called to obtain the name. In many cases this does
-# the right thing and you need not set anything explicitly.
-
-# primary_hostname =
-
-
-# The next three settings create two lists of domains and one list of hosts.
-# These lists are referred to later in this configuration using the syntax
-# +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
-# are all colon-separated lists:
-
-domainlist local_domains = @
-domainlist relay_to_domains =
-hostlist relay_from_hosts = 127.0.0.1
-
-# Most straightforward access control requirements can be obtained by
-# appropriate settings of the above options. In more complicated situations, you
-# may need to modify the Access Control List (ACL) which appears later in this
-# file.
-
-# The first setting specifies your local domains, for example:
-#
-# domainlist local_domains = my.first.domain : my.second.domain
-#
-# You can use "@" to mean "the name of the local host", as in the default
-# setting above. This is the name that is specified by primary_hostname,
-# as specified above (or defaulted). If you do not want to do any local
-# deliveries, remove the "@" rom the setting above. If you want to accept mail
-# addressed to your host's literal IP address, for example, mail addressed to
-# "user@[192.168.23.44]", you can add "@[]" as an item in the local domains
-# list. You also need to uncomment "allow_domain_literals" below. This is not
-# recommended for today's Internet.
-
-# The second setting specifies domains for which your host is an incoming relay.
-# If you are not doing any relaying, you should leave the list empty. However,
-# if your host is an MX backup or gateway of some kind for some domains, you
-# must set relay_to_domains to match those domains. For example:
-#
-# domainlist relay_to_domains = *.myco.com : my.friend.org
-#
-# This will allow any host to relay through your host to those domains.
-# See the section of the manual entitled "Control of relaying" for more
-# information.
-
-# The third setting specifies hosts that can use your host as an outgoing relay
-# to any other host on the Internet. Such a setting commonly refers to a
-# complete local network as well as the localhost. For example:
-#
-# hostlist relay_from_hosts = 127.0.0.1 : 192.168.0.0/16
-#
-# The "/16" is a bit mask (CIDR notation), not a number of hosts. Note that you
-# have to include 127.0.0.1 if you want to allow processes on your host to send
-# SMTP mail by using the loopback address. A number of MUAs use this method of
-# sending mail.
-
-
-# All three of these lists may contain many different kinds of item, including
-# wildcarded names, regular expressions, and file lookups. See the reference
-# manual for details. The lists above are used in the access control list for
-# incoming messages. The name of this ACL is defined here:
-
-acl_smtp_rcpt = acl_check_rcpt
-
-# You should not change that setting until you understand how ACLs work.
-
-
-# Specify the domain you want to be added to all unqualified addresses
-# here. An unqualified address is one that does not contain an "@" character
-# followed by a domain. For example, "caesar@rome.ex" is a fully qualified
-# address, but the string "caesar" (i.e. just a login name) is an unqualified
-# email address. Unqualified addresses are accepted only from local callers by
-# default. See the recipient_unqualified_hosts option if you want to permit
-# unqualified addresses from remote sources. If this option is not set, the
-# primary_hostname value is used for qualification.
-
-# qualify_domain =
-
-
-# If you want unqualified recipient addresses to be qualified with a different
-# domain to unqualified sender addresses, specify the recipient domain here.
-# If this option is not set, the qualify_domain value is used.
-
-# qualify_recipient =
-
-
-# The following line must be uncommented if you want Exim to recognize
-# addresses of the form "user@[10.11.12.13]" that is, with a "domain literal"
-# (an IP address) instead of a named domain. The RFCs still require this form,
-# but it makes little sense to permit mail to be sent to specific hosts by
-# their IP address in the modern Internet. This ancient format has been used
-# by those seeking to abuse hosts by using them for unwanted relaying. If you
-# really do want to support domain literals, uncomment the following line, and
-# see also the "domain_literal" router below.
-
-# allow_domain_literals
-
-
-# No deliveries will ever be run under the uids of these users (a colon-
-# separated list). An attempt to do so causes a panic error to be logged, and
-# the delivery to be deferred. This is a paranoic safety catch. Note that the
-# default setting means you cannot deliver mail addressed to root as if it
-# were a normal user. This isn't usually a problem, as most sites have an alias
-# for root that redirects such mail to a human administrator.
-
-never_users = root
-
-
-# The setting below causes Exim to 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, you can specify the networks for which a lookup is done, or
-# remove the setting entirely.
-
-host_lookup = *
-
-
-# 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 have problems
-# with them. This can result in a timeout instead of an immediate refused
-# connection, leading to delays on starting up an SMTP session.
-
-rfc1413_hosts = *
-rfc1413_query_timeout = 30s
-
-
-# By default, Exim expects all envelope addresses to be fully qualified, that
-# is, they must contain both a local part and a domain. If you want to accept
-# unqualified addresses (just a local part) from certain hosts, you can specify
-# these hosts by setting one or both of
-#
-# sender_unqualified_hosts =
-# recipient_unqualified_hosts =
-#
-# to control sender and recipient addresses, respectively. When this is done,
-# unqualified addresses are qualified using the settings of qualify_domain
-# and/or qualify_recipient (see above).
-
-
-# If you want Exim to support the "percent hack" for certain domains,
-# uncomment the following line and provide a list of 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. This
-# hack is rarely needed nowadays; you should not enable it unless you are sure
-# that you really need it.
-#
-# percent_hack_domains =
-#
-# As well as setting this option you will also need to remove the test
-# for local parts containing % in the ACL definition below.
-
-
-# When Exim can neither deliver a message nor return it to sender, it "freezes"
-# the delivery error message (aka "bounce message"). There are also other
-# circumstances in which messages get frozen. They will stay on the queue for
-# ever unless one of the following options is set.
-
-# This option unfreezes frozen bounce messages after two days, tries
-# once more to deliver them, and ignores any delivery failures.
-
-ignore_bounce_errors_after = 2d
-
-# This option cancels (removes) frozen messages that are older than a week.
-
-timeout_frozen_after = 7d
-
-
-
-######################################################################
-# ACL CONFIGURATION #
-# Specifies access control lists for incoming SMTP mail #
-######################################################################
-
-begin acl
-
-# 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 = :
-
- # Deny if the local part contains @ or % or / or | or !. These are rarely
- # found in genuine local parts, but are often tried by people looking to
- # circumvent relaying restrictions.
-
- deny local_parts = ^.*[@%!/|]
-
- # Accept mail to postmaster in any local domain, regardless of the source,
- # and without verifying the sender.
-
- accept local_parts = postmaster
- domains = +local_domains
-
- # Deny unless the sender address can be verified.
-
- require verify = sender
-
- #############################################################################
- # There are no checks on DNS "black" lists because the domains that contain
- # these lists are changing all the time. However, here are two examples of
- # how you could get Exim to perform a DNS black list lookup at this point.
- # The first one denies, while the second just warns.
- #
- # deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
- # dnslists = black.list.example
- #
- # warn message = X-Warning: $sender_host_address is in a black list at $dnslist_domain
- # log_message = found in $dnslist_domain
- # dnslists = black.list.example
- #############################################################################
-
- # Accept if the address is in a local domain, but only if the recipient can
- # be verified. Otherwise deny. The "endpass" line is the border between
- # passing on to the next ACL statement (if tests above it fail) or denying
- # access (if tests below it fail).
-
- accept domains = +local_domains
- endpass
- message = unknown user
- verify = recipient
-
- # Accept if the address is in a domain for which we are relaying, but again,
- # only if the recipient can be verified.
-
- accept domains = +relay_to_domains
- endpass
- message = unrouteable address
- verify = recipient
-
- # If control reaches this point, the domain is neither in +local_domains
- # nor in +relay_to_domains.
-
- # Accept if the message comes from one of the hosts for which we are an
- # outgoing relay. 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.
-
- accept hosts = +relay_from_hosts
-
- # Accept if the message arrived over an authenticated connection, from
- # any host. Again, these messages are usually from MUAs, so recipient
- # verification is omitted.
-
- accept authenticated = *
-
- # Reaching the end of the ACL causes a "deny", but we might as well give
- # an explicit message.
-
- deny message = relay not permitted
-
-
-
-######################################################################
-# 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
-
-# This router routes to remote hosts over SMTP by explicit IP address,
-# when an email address is given in "domain literal" form, for example,
-# <user@[192.168.35.64]>. The RFCs require this facility. However, it is
-# little-known these days, and has been exploited by evil people seeking
-# to abuse SMTP relays. Consequently it is commented out in the default
-# configuration. If you uncomment this router, you also need to uncomment
-# allow_domain_literals above, so that Exim can recognize the syntax of
-# domain literal addresses.
-
-# domain_literal:
-# driver = ipliteral
-# transport = remote_smtp
-
-
-# This router routes addresses that are not in local domains by doing a DNS
-# lookup on the domain name. Any domain that resolves to a loopback interface
-# address (127.0.0.0/8) is treated as if it had no DNS entry. If the DNS
-# lookup fails, no further routers are tried because of the no_more setting,
-# and consequently the address is unrouteable.
-
-dnslookup:
- driver = dnslookup
- domains = ! +local_domains
- transport = remote_smtp
- ignore_target_hosts = 127.0.0.0/8
- no_more
-
-
-# The remaining routers handle addresses in the local domain(s).
-
-
-# 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".
-#
-# If any of your aliases expand to pipes or files, you will need to set
-# up a user and a group for these deliveries to run under. You can do
-# this by uncommenting the "user" option below (changing the user name
-# as appropriate) and adding a "group" option if necessary. Alternatively, you
-# can specify "user" on the transports that are used. Note that the transports
-# listed below are the same as are used for .forward files; you might want
-# to set up different ones for pipe and file deliveries from aliases.
-
-system_aliases:
- driver = redirect
- allow_fail
- allow_defer
- data = ${lookup{$local_part}lsearch{/etc/aliases}}
-# user = exim
- file_transport = address_file
- pipe_transport = address_pipe
-
-
-# This router handles forwarding using traditional .forward files in users'
-# home directories. If you want it also to allow mail filtering when a forward
-# file starts with the string "# Exim filter", uncomment the "allow_filter"
-# option.
-
-# 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 three transports specified at the end are those that are used when
-# forwarding generates a direct delivery to a file, or to a pipe, or sets
-# up an auto-reply, respectively.
-
-userforward:
- driver = redirect
- check_local_user
- file = $home/.forward
- no_verify
- no_expn
- check_ancestor
-# allow_filter
- file_transport = address_file
- pipe_transport = address_pipe
- reply_transport = address_reply
-
-
-# This router matches local user mailboxes.
-
-localuser:
- driver = accept
- check_local_user
- transport = local_delivery
-
-
-
-######################################################################
-# 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
-
-
-# This transport is used for delivering messages over SMTP connections.
-
-remote_smtp:
- driver = smtp
-
-
-# This transport is used for local delivery to user mailboxes in traditional
-# BSD mailbox format. By default it will be run under the uid and gid of the
-# local user, and requires the sticky bit to be set on the /var/mail directory.
-# Some systems use the alternative approach of running mail deliveries under a
-# particular group instead of using the sticky bit. The commented options below
-# show how this can be done.
-
-local_delivery:
- driver = appendfile
- file = /var/mail/$local_part
- delivery_date_add
- envelope_to_add
- return_path_add
-# group = mail
-# mode = 0660
-
-
-# This transport is used for handling pipe deliveries generated by alias or
-# .forward files. If the pipe generates any standard output, it is returned
-# to the sender of the message as a delivery error. Set return_fail_output
-# instead of return_output if you want this to happen only when the pipe fails
-# to complete normally. You can set different transports for aliases and
-# forwards if you want to - see the references to address_pipe in the routers
-# section above.
-
-address_pipe:
- driver = pipe
- return_output
-
-
-# This transport is used for handling deliveries directly to files that are
-# generated by aliasing or forwarding.
-
-address_file:
- driver = appendfile
- delivery_date_add
- envelope_to_add
- return_path_add
-
-
-# This transport is used for handling autoreplies generated by the filtering
-# option of the userforward router.
-
-address_reply:
- driver = autoreply
-
-
-
-######################################################################
-# RETRY CONFIGURATION #
-######################################################################
-
-begin retry
-
-# 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.
-
-# Domain Error Retries
-# ------ ----- -------
-
-* * F,2h,15m; G,16h,1h,1.5; F,4d,6h
-
-
-
-######################################################################
-# REWRITE CONFIGURATION #
-######################################################################
-
-# There are no rewriting specifications in this default configuration file.
-
-begin rewrite
-
-
-
-######################################################################
-# AUTHENTICATION CONFIGURATION #
-######################################################################
-
-# There are no authenticator specifications in this default configuration file.
-
-begin authenticators
-
-
-# End of Exim configuration file