+++ /dev/null
-# Exim: OS-specific make file for Linux. This is for modern Linuxes,
-# which use libc6.
-
-BASENAME_COMMAND=look_for_it
-CC=gcc
-CFLAGS=
-
-DBMLIB = -ldb
-USE_DB = yes
-
-LIBS = -lnsl
-LIBRESOLV = -lresolv
-
-X11=/usr/X11R6
-XINCLUDE=-I$(X11)/include
-XLFLAGS=-L$(X11)/lib -lSM -lICE
-X11_LD_LIB=$(X11)/lib
-
-EXIWHAT_PS_ARG=ax
-EXIWHAT_EGREP_ARG='/exim( |$$)'
-EXIWHAT_KILL_ARG=-USR1
-
-# PLD goodies
-HAVE_IPV6=yes
-LOOKUP_LDAP=yes
-LOOKUP_NIS=yes
-LOOKUP_NISPLUS=yes
-EXIM_PERL=perl.o
-#USE_TCP_WRAPPERS=yes
-#EXTRALIBS=-lwrap
-EXTRALIBS=-lldap -llber
-
-# End
+++ /dev/null
-diff -Naur exim-4.43.orig/src/auths/auth-spa.c exim-4.43/src/auths/auth-spa.c
---- exim-4.43.orig/src/auths/auth-spa.c 2004-10-05 10:32:08.000000000 +0200
-+++ exim-4.43/src/auths/auth-spa.c 2005-01-08 00:33:23.444497800 +0100
-@@ -404,8 +404,10 @@
- *out = '\0';
- }
-
-+/* The outlength parameter was added by PH, December 2004 */
-+
- int
--spa_base64_to_bits (char *out, const char *in)
-+spa_base64_to_bits (char *out, int outlength, const char *in)
- /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
- {
- int len = 0;
-@@ -418,6 +420,8 @@
-
- do
- {
-+ if (len >= outlength) /* Added by PH */
-+ return (-1); /* Added by PH */
- digit1 = in[0];
- if (DECODE64 (digit1) == BAD)
- return (-1);
-@@ -435,12 +439,16 @@
- ++len;
- if (digit3 != '=')
- {
-+ if (len >= outlength) /* Added by PH */
-+ return (-1); /* Added by PH */
- *out++ =
- ((DECODE64 (digit2) << 4) & 0xf0) | (DECODE64 (digit3) >> 2);
- ++len;
- if (digit4 != '=')
- {
-- *out++ = ((DECODE64 (digit3) << 6) & 0xc0) | DECODE64 (digit4);
-+ if (len >= outlength) /* Added by PH */
-+ return (-1); /* Added by PH */
-+ *out++ = ((DECODE64 (digit3) << 6) & 0xc0) | DECODE64 (digit4);
- ++len;
- }
- }
-diff -Naur exim-4.43.orig/src/auths/auth-spa.h exim-4.43/src/auths/auth-spa.h
---- exim-4.43.orig/src/auths/auth-spa.h 2004-10-05 10:32:08.000000000 +0200
-+++ exim-4.43/src/auths/auth-spa.h 2005-01-08 00:33:23.444497800 +0100
-@@ -10,6 +10,9 @@
- * Samba project (by Andrew Tridgell, Jeremy Allison, and others).
- */
-
-+/* December 2004: The spa_base64_to_bits() function has no length checking in
-+ * it. I have added a check. PH */
-+
- /* It seems that some systems have existing but different definitions of some
- of the following types. I received a complaint about "int16" causing
- compilation problems. So I (PH) have renamed them all, to be on the safe side.
-@@ -75,7 +78,7 @@
- #define spa_request_length(ptr) (((ptr)->buffer - (uint8x*)(ptr)) + (ptr)->bufIndex)
-
- void spa_bits_to_base64 (unsigned char *, const unsigned char *, int);
--int spa_base64_to_bits(char *, const char *);
-+int spa_base64_to_bits(char *, int, const char *);
- void spa_build_auth_response (SPAAuthChallenge *challenge,
- SPAAuthResponse *response, char *user, char *password);
- void spa_build_auth_request (SPAAuthRequest *request, char *user,
-diff -Naur exim-4.43.orig/src/auths/spa.c exim-4.43/src/auths/spa.c
---- exim-4.43.orig/src/auths/spa.c 2004-10-05 10:32:08.000000000 +0200
-+++ exim-4.43/src/auths/spa.c 2005-01-08 00:33:42.155653272 +0100
-@@ -133,7 +133,7 @@
- return FAIL;
- }
-
--if (spa_base64_to_bits((char *)(&request), (const char *)(data)) < 0)
-+if (spa_base64_to_bits((char *)(&request), sizeof(request), (const char *)(data)) < 0)
- {
- DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
- "request: %s\n", data);
-@@ -153,7 +153,7 @@
- }
-
- /* dump client response */
--if (spa_base64_to_bits((char *)(&response), (const char *)(data)) < 0)
-+if (spa_base64_to_bits((char *)(&response), sizeof(response), (const char *)(data)) < 0)
- {
- DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
- "response: %s\n", data);
-@@ -319,7 +319,7 @@
- /* convert the challenge into the challenge struct */
- DSPA("\n\n%s authenticator: challenge (%s)\n\n",
- ablock->name, buffer + 4);
-- spa_base64_to_bits ((char *)(&challenge), (const char *)(buffer + 4));
-+ spa_base64_to_bits ((char *)(&challenge), sizeof(challenge), (const char *)(buffer + 4));
-
- spa_build_auth_response (&challenge, &response,
- CS username, CS password);
-diff -Naur exim-4.43.orig/src/host.c exim-4.43/src/host.c
---- exim-4.43.orig/src/host.c 2004-10-05 10:32:08.000000000 +0200
-+++ exim-4.43/src/host.c 2005-01-08 00:33:01.790789664 +0100
-@@ -710,12 +710,18 @@
-
- if (*p == ':') p++;
-
-- /* Split the address into components separated by colons. */
-+ /* Split the address into components separated by colons. The input address
-+ * is supposed to be checked for syntax. There was a case where this was
-+ * overlooked; to guard against that happening again, check here and crash if
-+ * there is a violation. */
-
- while (*p != 0)
- {
- int len = Ustrcspn(p, ":");
- if (len == 0) nulloffset = ci;
-+ if (ci > 7) log_write(0, LOG_MAIN|LOG_PANIC_DIE,
-+ "Internal error: invalid IPv6 address \"%s\" passed to host_aton()",
-+ address);
- component[ci++] = p;
- p += len;
- if (*p == ':') p++;
-diff -Naur exim-4.43.orig/src/lookups/dnsdb.c exim-4.43/src/lookups/dnsdb.c
---- exim-4.43.orig/src/lookups/dnsdb.c 2004-10-05 10:32:08.000000000 +0200
-+++ exim-4.43/src/lookups/dnsdb.c 2005-01-08 00:32:31.125451504 +0100
-@@ -125,7 +125,7 @@
- /* If the type is PTR, we have to construct the relevant magic lookup
- key. This code is now in a separate function. */
-
--if (type == T_PTR)
-+if (type == T_PTR && string_is_ip_address(keystring, NULL))
- {
- dns_build_reverse(keystring, buffer);
- keystring = buffer;
+++ /dev/null
-diff -urN exim-4.20-orig/Local/Makefile exim-4.20/Local/Makefile
---- exim-4.20-orig/Local/Makefile 2003-07-30 16:33:47.000000000 -0600
-+++ exim-4.20/Local/Makefile 2003-07-30 16:38:13.000000000 -0600
-@@ -242,7 +242,7 @@
-
- LOOKUP_CDB=yes
- # LOOKUP_DNSDB=yes
--# LOOKUP_DSEARCH=yes
-+LOOKUP_DSEARCH=yes
- # LOOKUP_LDAP=yes
- # LOOKUP_MYSQL=yes
- # LOOKUP_NIS=yes
-diff -urN exim-4.20-orig/Local/Makefile~ exim-4.20/Local/Makefile~
---- exim-4.20-orig/Local/Makefile~ 1969-12-31 17:00:00.000000000 -0700
-+++ exim-4.20/Local/Makefile~ 2003-07-30 16:35:46.000000000 -0600
-@@ -0,0 +1,822 @@
-+##################################################
-+# The Exim mail transport agent #
-+##################################################
-+
-+# This is the template for Exim's main build-time configuration file. It
-+# contains settings that are independent of any operating system. These are
-+# things that are mostly sysadmin choices. The items below are divided into
-+# those you must specify, those you probably want to specify, those you might
-+# often want to specify, and those that you almost never need to mention.
-+
-+# Edit this file and save the result to a file called Local/Makefile within the
-+# Exim distribution directory before running the "make" command.
-+
-+# Things that depend on the operating system have default settings in
-+# OS/Makefile-Default, but these are overridden for some OS by files called
-+# called OS/Makefile-<osname>. You can further override these by creating files
-+# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-+# operating system - look at the names in the OS directory to see which names
-+# are recognized.
-+
-+# However, if you are building Exim for a single OS only, you don't need to
-+# worry about setting up Local/Makefile-<osname>. Any build-time configuration
-+# settings you require can in fact be placed in the one file called
-+# Local/Makefile. It is only if you are building for several OS from the same
-+# source files that you need to worry about splitting off your own OS-dependent
-+# settings into separate files. (There's more explanation about how this all
-+# works in the toplevel README file, under "Modifying the building process", as
-+# well as in the Exim specification.)
-+
-+# One OS-specific thing that may need to be changed is the command for running
-+# the C compiler; the overall default is gcc, but some OS Makefiles specify cc.
-+# You can override anything that is set by putting CC=whatever in your
-+# Local/Makefile.
-+
-+# NOTE: You should never need to edit any of the distributed Makefiles; all
-+# overriding can be done in your Local/Makefile(s). This will make it easier
-+# for you when the next release comes along.
-+
-+# The location of the X11 libraries is something else that is quite variable
-+# even between different versions of the same operating system (and indeed
-+# there are different versions of X11 as well, of course). The four settings
-+# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB
-+# (dynamic run-time library). You need not worry about X11 unless you want to
-+# compile the Exim monitor utility. Exim itself does not use X11.
-+
-+# Another area of variability between systems is the type and location of the
-+# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB.
-+# By default the code assumes ndbm; this often works with gdbm or DB, provided
-+# they are correctly installed, via their compatibility interfaces. However,
-+# Exim can also be configured to use the native calls for Berkeley DB (obsolete
-+# versions 1.85 and 2.x, or the current 3.x version) and also for gdbm.
-+
-+# For some operating systems, a default DBM library (other than ndbm) is
-+# selected by a setting in the OS-specific Makefile. Most modern OS now have
-+# a DBM library installed as standard, and in many cases this will be selected
-+# for you by the OS-specific configuration. If Exim compiles without any
-+# problems, you probably do not have to worry about the DBM library. If you
-+# do want or need to change it, you should first read the discussion in the
-+# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's
-+# interface to the DBM library.
-+
-+# In Local/Makefiles blank lines and lines starting with # are ignored. It is
-+# also permitted to use the # character to add a comment to a setting, for
-+# example
-+#
-+# EXIM_GID=42 # the "mail" group
-+#
-+# However, with some versions of "make" this works only if there is no white
-+# space between the end of the setting and the #, so perhaps it is best
-+# avoided. A consequence of this facility is that it is not possible to have
-+# the # character present in any setting, but I can't think of any cases where
-+# this would be wanted.
-+###############################################################################
-+
-+
-+
-+###############################################################################
-+# THESE ARE THINGS YOU MUST SPECIFY #
-+###############################################################################
-+
-+# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and
-+# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number.
-+
-+# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it
-+# really is a very good idea to specify it here rather than at run time. This
-+# is particularly true if you let the logs go to their default location in the
-+# spool directory, because it means that the location of the logs is known
-+# before Exim has read the run time configuration file.
-+
-+#------------------------------------------------------------------------------
-+# BIN_DIRECTORY defines where the exim binary will be installed by "make
-+# install". The path is also used internally by Exim when it needs to re-invoke
-+# itself, either to send an error message, or to recover root privilege. Exim's
-+# utility binaries and scripts are also installed in this directory. There is
-+# no "standard" place for the binary directory. Some people like to keep all
-+# the Exim files under one directory such as /usr/exim; others just let the
-+# Exim binaries go into an existing directory such as /usr/sbin or
-+# /usr/local/sbin. The installation script will try to create this directory,
-+# and any superior directories, if they do not exist.
-+
-+BIN_DIRECTORY=/usr/bin
-+
-+
-+#------------------------------------------------------------------------------
-+# CONFIGURE_FILE defines where Exim's run time configuration file is to be
-+# found. It is the complete pathname for the file, not just a directory. The
-+# location of all other run time files and directories can be changed in the
-+# run time configuration file. There is a lot of variety in the choice of
-+# location in different OS, and in the preferences of different sysadmins. Some
-+# common locations are in /etc or /etc/mail or /usr/local/etc or
-+# /usr/local/etc/mail. Another possibility is to keep all the Exim files under
-+# a single directory such as /usr/exim. Whatever you choose, the installation
-+# script will try to make the directory and any superior directories if they
-+# don't exist. It will also install a default runtime configuration if this
-+# file does not exist.
-+
-+CONFIGURE_FILE=/etc/mail/exim.conf
-+
-+# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
-+# In this case, Exim will use the first of them that exists when it is run.
-+# However, if a list is specified, the installation script no longer tries to
-+# make superior directories or to install a default runtime configuration.
-+
-+
-+#------------------------------------------------------------------------------
-+# The Exim binary must normally be setuid root, so that it starts executing as
-+# root, but (depending on the options with which it is called) it does not
-+# always need to retain the root privilege. These settings define the user and
-+# group that is used for Exim processes when they no longer need to be root. In
-+# particular, this applies when receiving messages and when doing remote
-+# deliveries. (Local deliveries run as various non-root users, typically as the
-+# owner of a local mailbox.) Specifying these values as root is very strongly
-+# discouraged. These values are compiled into the binary.
-+
-+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
-+# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
-+# you want to use a group other than the default group for the given user.
-+
-+# EXIM_GROUP=
-+
-+# Many sites define a user called "exim", with an appropriate default group,
-+# and use
-+#
-+# EXIM_USER=exim
-+#
-+# while leaving EXIM_GROUP unspecified (commented out).
-+
-+
-+#------------------------------------------------------------------------------
-+# SPOOL_DIRECTORY defines the directory where all the data for messages in
-+# transit is kept. It is strongly recommended that you define it here, though
-+# it is possible to leave this till the run time configuration.
-+
-+# Exim creates the spool directory if it does not exist. The owner and group
-+# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to
-+# all the files and directories that are created in the spool directory.
-+
-+# Almost all installations choose this:
-+
-+SPOOL_DIRECTORY=/var/spool/exim
-+
-+
-+
-+###############################################################################
-+# THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY #
-+###############################################################################
-+
-+# You need to specify some routers and transports if you want the Exim that you
-+# are building to be capable of delivering mail. You almost certainly need at
-+# least one type of lookup. You should consider whether you want to build
-+# the Exim monitor or not.
-+
-+
-+#------------------------------------------------------------------------------
-+# These settings determine which individual router drivers are included in the
-+# Exim binary. There are no defaults in the code; those routers that are wanted
-+# must be defined here by setting the appropriate variables to the value "yes".
-+# Including a router in the binary does not cause it to be used automatically.
-+# It has also to be configured in the run time configuration file. By
-+# commenting out those you know you don't want to use, you can make the binary
-+# a bit smaller. If you are unsure, leave all of these included for now.
-+
-+ROUTER_ACCEPT=yes
-+ROUTER_DNSLOOKUP=yes
-+ROUTER_IPLITERAL=yes
-+ROUTER_MANUALROUTE=yes
-+ROUTER_QUERYPROGRAM=yes
-+ROUTER_REDIRECT=yes
-+
-+# This one is very special-purpose, so is not included by default.
-+
-+# ROUTER_IPLOOKUP=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# These settings determine which individual transport drivers are included in
-+# the Exim binary. There are no defaults; those transports that are wanted must
-+# be defined here by setting the appropriate variables to the value "yes".
-+# Including a transport in the binary does not cause it to be used
-+# automatically. It has also to be configured in the run time configuration
-+# file. By commenting out those you know you don't want to use, you can make
-+# the binary a bit smaller. If you are unsure, leave all of these included for
-+# now.
-+
-+TRANSPORT_APPENDFILE=yes
-+TRANSPORT_AUTOREPLY=yes
-+TRANSPORT_PIPE=yes
-+TRANSPORT_SMTP=yes
-+
-+# This one is special-purpose, and commonly not required, so it is not
-+# included by default.
-+
-+TRANSPORT_LMTP=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# The appendfile transport can write messages to local mailboxes in a number
-+# of formats. The code for three specialist formats, maildir, mailstore, and
-+# 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
-+
-+
-+#------------------------------------------------------------------------------
-+# These settings determine which file and database lookup methods are included
-+# in the binary. See the manual chapter entitled "File and database lookups"
-+# for discussion. DBM and lsearch (linear search) are included by default. If
-+# you are unsure about the others, leave them commented out for now.
-+# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is
-+# for the specialist case of using the DNS as a general database facility (not
-+# common).
-+
-+LOOKUP_DBM=yes
-+LOOKUP_LSEARCH=yes
-+
-+LOOKUP_CDB=yes
-+# LOOKUP_DNSDB=yes
-+LOOKUP_DSEARCH=yes
-+# LOOKUP_LDAP=yes
-+# LOOKUP_MYSQL=yes
-+# LOOKUP_NIS=yes
-+# LOOKUP_NISPLUS=yes
-+# LOOKUP_ORACLE=yes
-+# LOOKUP_PASSWD=yes
-+# LOOKUP_PGSQL=yes
-+# LOOKUP_WHOSON=yes
-+# LOOKUP_WILDLSEARCH=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate
-+# which LDAP library you have. Unfortunately, though most of their functions
-+# are the same, there are minor differences. Currently Exim knows about four
-+# LDAP libraries: the one from the University of Michigan (also known as
-+# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes
-+# with Solaris 7 onwards. Uncomment whichever of these you are using.
-+
-+# LDAP_LIB_TYPE=OPENLDAP1
-+# LDAP_LIB_TYPE=OPENLDAP2
-+# LDAP_LIB_TYPE=NETSCAPE
-+# LDAP_LIB_TYPE=SOLARIS
-+
-+# If you don't set any of these, Exim assumes the original University of
-+# Michigan (OpenLDAP 1) library.
-+
-+
-+#------------------------------------------------------------------------------
-+# Additional libraries and include directories may be required for some
-+# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on
-+# the command for linking Exim itself, not on any auxiliary programs. You
-+# don't need to set LOOKUP_INCLUDE if the relevant directories are already
-+# specified in INCLUDE.
-+
-+# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-+# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq
-+
-+
-+#------------------------------------------------------------------------------
-+# Compiling the Exim monitor: If you want to compile the Exim monitor, a
-+# program that requires an X11 display, then EXIM_MONITOR should be set to the
-+# value "eximon.bin". Comment out this setting to disable compilation of the
-+# monitor. The locations of various X11 directories for libraries and include
-+# files are defaulted in the OS/Makefile-Default file, but can be overridden in
-+# local OS-specific make files.
-+
-+EXIM_MONITOR=eximon.bin
-+
-+
-+
-+###############################################################################
-+# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY #
-+###############################################################################
-+
-+# The items in this section are those that are commonly changed according to
-+# the sysadmin's preferences, but whose defaults are often acceptable.
-+
-+
-+#------------------------------------------------------------------------------
-+# Exim has support for the AUTH (authentication) extension of the SMTP
-+# protocol, as defined by RFC 2554. If you don't know what SMTP authentication
-+# is, you probably won't want to include this code, so you should leave these
-+# settings commented out. If you do want to make use of SMTP authentication,
-+# you must uncomment at least one of the following, so that appropriate code is
-+# 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_SPA=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# The passwords for user accounts are normally encrypted with the crypt()
-+# function. Comparisons with encrypted passwords can be done using Exim's
-+# "crypteq" expansion operator. (This is commonly used as part of the
-+# configuration of an authenticator for use with SMTP AUTH.) At least one
-+# operating system has an extended function called crypt16(), which uses up to
-+# 16 characters of a password (the normal crypt() uses only the first 8). Exim
-+# supports the use of crypt16() as well as crypt().
-+
-+# You can always indicate a crypt16-encrypted password by preceding it with
-+# "{crypt16}". If you want the default handling (without any preceding
-+# indicator) to use crypt16(), uncomment the following line:
-+
-+# DEFAULT_CRYPT=crypt16
-+
-+# If you do that, you can still access the basic crypt() function by preceding
-+# an encrypted password with "{crypt}". For more details, see the description
-+# of the "crypteq" condition in the manual chapter on string expansions.
-+
-+# Since most operating systems do not include a crypt16() function (yet?), Exim
-+# has one of its own, which it uses unless HAVE_CRYPT16 is defined. Normally,
-+# that will be set in an OS-specific Makefile for the OS that have such a
-+# function, so you should not need to bother with it.
-+
-+
-+#------------------------------------------------------------------------------
-+# Exim can be built to support the SMTP STARTTLS command, which implements
-+# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
-+# must install the OpenSSL library package or the GnuTLS library. Exim contains
-+# no cryptographic code of its own. Uncomment the following lines if you want
-+# to build Exim with TLS support. If you don't know what this is all about,
-+# leave these settings commented out.
-+
-+# This setting is required for any TLS support (either OpenSSL or GnuTLS)
-+SUPPORT_TLS=yes
-+
-+# Uncomment this setting if you are using OpenSSL
-+TLS_LIBS=-lssl -lcrypto
-+
-+# Uncomment these settings if you are using GnuTLS
-+# USE_GNUTLS=yes
-+# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
-+
-+# 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
-+# certificate, and tell Exim about it by means of the tls_certificate
-+# and tls_privatekey run time options. You also need to set tls_advertise_hosts
-+# to specify the hosts to which Exim advertises TLS support. On the other hand,
-+# if you are running Exim only as a client, building it with TLS support
-+# is all you need to do.
-+
-+# Additional libraries and include files are required for both OpenSSL and
-+# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
-+# with all your other libraries. If they are in a special directory, you may
-+# need something like
-+
-+# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
-+# or
-+# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
-+
-+# TLS_LIBS is included only on the command for linking Exim itself, not on any
-+# auxiliary programs. If the include files are not in a standard place, you can
-+# set TLS_INCLUDE to specify where they are, for example:
-+
-+# TLS_INCLUDE=-I/usr/local/openssl/include/
-+# or
-+# TLS_INCLUDE=-I/opt/gnu/include
-+
-+# You don't need to set TLS_INCLUDE if the relevant directories are already
-+# specified in INCLUDE.
-+
-+
-+#------------------------------------------------------------------------------
-+# The default distribution of Exim contains only the plain text form of the
-+# documentation. Other forms are available separately. If you want to install
-+# the documentation in "info" format, first fetch the Texinfo documentation
-+# sources from the ftp directory and unpack them, which should create files
-+# with the extension "texinfo" in the doc directory. You may find that the
-+# version number of the texinfo files is different to your Exim version number,
-+# because the main documentation isn't updated as often as the code. For
-+# example, if you have Exim version 4.03, the source tarball upacks into a
-+# directory called exim-4.03, but the texinfo tarball unpacks into exim-4.00.
-+# In this case, move the contents of exim-4.00/doc into exim-4.03/doc after you
-+# have unpacked them. Then set INFO_DIRECTORY to the location of your info
-+# directory. This varies from system to system, but is often /usr/share/info.
-+# 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
-+
-+
-+#------------------------------------------------------------------------------
-+# Exim log directory and files: Exim creates several log files inside a
-+# single log directory. You can define the directory and the form of the
-+# log file name here. If you do not set anything, Exim creates a directory
-+# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses
-+# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change
-+# this, you can set LOG_FILE_PATH to a path name containing one occurrence of
-+# %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/%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
-+# it for itself. It is also your responsibility to ensure that Exim is capable
-+# of writing files using this path name. The Exim user (see EXIM_USER above)
-+# must be able to create and update files in the directory you have specified.
-+
-+# You can also configure Exim to use syslog, instead of or as well as log
-+# files, by settings such as these
-+
-+# LOG_FILE_PATH=syslog
-+# LOG_FILE_PATH=syslog:/var/log/exim_%slog
-+
-+# The first of these uses only syslog; the second uses syslog and also writes
-+# to log files. Do not include white space in such a setting as it messes up
-+# the building process.
-+
-+
-+#------------------------------------------------------------------------------
-+# When logging to syslog, the following option caters for syslog replacements
-+# that are able to accept log entries longer than the 1024 characters allowed
-+# by RFC 3164. It is up to you to make sure your syslog daemon can handle this.
-+# Non-printable characters are usually unacceptable regardless, so log entries
-+# are still split on newline characters.
-+
-+# SYSLOG_LONG_LINES=yes
-+
-+# If you are not interested in the process identifier (pid) of the Exim that is
-+# making the call to syslog, then comment out the following line.
-+
-+SYSLOG_LOG_PID=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# Cycling log files: this variable specifies the maximum number of old
-+# log files that are kept by the exicyclog log-cycling script. You don't have
-+# to use exicyclog. If your operating system has other ways of cycling log
-+# files, you can use them instead. The exicyclog script isn't run by default;
-+# you have to set up a cron job for it if you want it.
-+
-+EXICYCLOG_MAX=10
-+
-+
-+#------------------------------------------------------------------------------
-+# The compress command is used by the exicyclog script to compress old log
-+# 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=/bin/gzip
-+COMPRESS_SUFFIX=gz
-+
-+
-+#------------------------------------------------------------------------------
-+# If the exigrep utility is fed compressed log files, it tries to uncompress
-+# them using this command.
-+
-+ZCAT_COMMAND=/bin/zcat
-+
-+
-+#------------------------------------------------------------------------------
-+# Compiling in support for embedded Perl: If you want to be able to
-+# use Perl code in Exim's string manipulation language and you have Perl
-+# (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 has support for PAM (Pluggable Authentication Modules), a facility
-+# which is available in the latest releases of Solaris and in some GNU/Linux
-+# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim
-+# 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
-+
-+# 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,
-+# which is intended for use in conjunction with the SMTP AUTH facilities,
-+# is included only when requested by setting the following parameter to the
-+# location of your Radius configuration file:
-+
-+# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf
-+
-+
-+#------------------------------------------------------------------------------
-+# Support for authentication via the Cyrus SASL pwcheck daemon is available.
-+# The Exim support, which is intented for use in conjunction with the SMTP AUTH
-+# facilities, is included only when requested by setting the following
-+# parameter to the location of the pwcheck daemon's socket directory.
-+#
-+# There is no need to install all of SASL on your system. You just need to run
-+# ./configure --with-pwcheck, cd to the pwcheck directory with sources, make
-+# and make install. You must create the socket directory (default /var/pwcheck)
-+# and chown it to exim's user and group. Once you have installed pwcheck, you
-+# should arrange for it to be started by root at boot time.
-+
-+CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
-+
-+
-+#------------------------------------------------------------------------------
-+# Support for authentication via the Cyrus SASL saslauthd daemon is available.
-+# The Exim support, which is intented for use in conjunction with the SMTP AUTH
-+# facilities, is included only when requested by setting the following
-+# parameter to the location of the saslauthd daemon's socket directory.
-+#
-+# There is no need to install all of SASL on your system. You just need to run
-+# ./configure --with-saslauthd, cd to the saslauthd directory with sources, make
-+# and make install. You must create the socket directory (default /var/saslauthd)
-+# and chown it to exim's user and group. Once you have installed saslauthd, you
-+# should arrange for it to be started by root at boot time.
-+
-+CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
-+
-+#------------------------------------------------------------------------------
-+# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-+# this setting. See the manual section entitled "Use of tcpwrappers" in the
-+# chapter on building and installing Exim.
-+
-+# USE_TCP_WRAPPERS=yes
-+
-+# You may well also have to specify a local "include" file and an additional
-+# library for TCP wrappers, so you probably need something like this:
-+
-+# USE_TCP_WRAPPERS=yes
-+# CFLAGS=-O -I/usr/local/include
-+# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
-+
-+# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
-+# as well.
-+
-+
-+#------------------------------------------------------------------------------
-+# The default action of the exim_install script (which is run by "make
-+# install") is to install the Exim binary with a unique name such as
-+# exim-4.20-1, and then set up a symbolic link called "exim" to reference it,
-+# moving the symbolic link from any previous version. If you define NO_SYMLINK
-+# (the value doesn't matter), the symbolic link is not created or moved. You
-+# will then have to "turn Exim on" by setting up the link manually.
-+
-+# NO_SYMLINK=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# Another default action of the install script is to install a default runtime
-+# configuration file if one does not exist. This configuration has a router for
-+# expanding system aliases. The default assumes that these aliases are kept
-+# in the traditional file called /etc/aliases. If such a file does not exist,
-+# the installation script creates one that contains just comments (no actual
-+# aliases). The following setting can be changed to specify a different
-+# location for the system alias file.
-+
-+SYSTEM_ALIASES_FILE=/etc/aliases
-+
-+
-+
-+###############################################################################
-+# THINGS YOU ALMOST NEVER NEED TO MENTION #
-+###############################################################################
-+
-+# The settings in this section are available for use in special circumstances.
-+# In the vast majority of installations you need not change anything below.
-+
-+
-+#------------------------------------------------------------------------------
-+# The following commands live in different places in some OS. Either the
-+# ultimate default settings, or the OS-specific files should already point to
-+# the right place, but they can be overridden here if necessary. These settings
-+# are used when building various scripts to ensure that the correct paths are
-+# used when the scripts are run. They are not used in the Makefile itself. Perl
-+# is not necessary for running Exim unless you set EXIM_PERL (see above) to get
-+# it embedded, but there are some utilities that are Perl scripts. If you
-+# haven't got Perl, Exim will still build and run; you just won't be able to
-+# use those utilities.
-+
-+# CHOWN_COMMAND=/usr/bin/chown
-+# CHGRP_COMMAND=/usr/bin/chgrp
-+# MV_COMMAND=/bin/mv
-+# RM_COMMAND=/bin/rm
-+# PERL_COMMAND=/usr/bin/perl
-+
-+
-+#------------------------------------------------------------------------------
-+# The following macro can be used to change the command for building a library
-+# of functions. By default the "ar" command is used, with options "cq".
-+# Only in rare circumstances should you need to change this.
-+
-+# AR=ar cq
-+
-+
-+#------------------------------------------------------------------------------
-+# The following macros can be used to change the default modes that are used
-+# by the appendfile transport. In most installations the defaults are just
-+# fine, and in any case, you can change particular instances of the transport
-+# at run time if you want.
-+
-+# APPENDFILE_MODE=0600
-+# APPENDFILE_DIRECTORY_MODE=0700
-+# APPENDFILE_LOCKFILE_MODE=0600
-+
-+
-+#------------------------------------------------------------------------------
-+# In some installations there may be multiple machines sharing file systems,
-+# where a different configuration file is required for Exim on the different
-+# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look
-+# for a configuration file whose name is that defined by CONFIGURE_FILE,
-+# with the node name obtained by uname() tacked on the end, separated by a
-+# 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
-+
-+
-+#------------------------------------------------------------------------------
-+# In some esoteric configurations two different versions of Exim are run,
-+# with different setuid values, and different configuration files are required
-+# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then
-+# Exim will first look for a configuration file whose name is that defined
-+# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by
-+# a period (for eximple, /usr/exim/configure.0). If this file does not exist,
-+# then the bare configuration file name is tried. In the case when both
-+# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files
-+# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>.
-+
-+# CONFIGURE_FILE_USE_EUID=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# The size of the delivery buffers: These specify the sizes (in bytes) of
-+# the buffers that are used when copying a message from the spool to a
-+# destination. There is rarely any need to change these values.
-+
-+# DELIVER_IN_BUFFER_SIZE=8192
-+# DELIVER_OUT_BUFFER_SIZE=8192
-+
-+
-+#------------------------------------------------------------------------------
-+# The mode of the database directory: Exim creates a directory called "db"
-+# in its spool directory, to hold its databases of hints. This variable
-+# determines the mode of the created directory. The default value in the
-+# source is 0750.
-+
-+# EXIMDB_DIRECTORY_MODE=0750
-+
-+
-+#------------------------------------------------------------------------------
-+# Database file mode: The mode of files created in the "db" directory defaults
-+# to 0640 in the source, and can be changed here.
-+
-+# EXIMDB_MODE=0640
-+
-+
-+#------------------------------------------------------------------------------
-+# Database lock file mode: The mode of zero-length files created in the "db"
-+# directory to use for locking purposes defaults to 0640 in the source, and
-+# can be changed here.
-+
-+# EXIMDB_LOCKFILE_MODE=0640
-+
-+
-+#------------------------------------------------------------------------------
-+# This parameter sets the maximum length of the header portion of a message
-+# that Exim is prepared to process. The default setting is one megabyte. The
-+# limit exists in order to catch rogue mailers that might connect to your SMTP
-+# port, start off a header line, and then just pump junk at it for ever. The
-+# message_size_limit option would also catch this, but it may not be set.
-+# The value set here is the default; it can be changed at runtime.
-+
-+# HEADER_MAXSIZE="(1024*1024)"
-+
-+
-+#------------------------------------------------------------------------------
-+# The mode of the input directory: The input directory is where messages are
-+# kept while awaiting delivery. Exim creates it if necessary, using a mode
-+# which can be defined here (default 0750).
-+
-+# INPUT_DIRECTORY_MODE=0750
-+
-+
-+#------------------------------------------------------------------------------
-+# The mode of Exim's log directory, when it is created by Exim inside the spool
-+# directory, defaults to 0750 but can be changed here.
-+
-+# LOG_DIRECTORY_MODE=0750
-+
-+
-+#------------------------------------------------------------------------------
-+# The log files themselves are created as required, with a mode that defaults
-+# to 0640, but which can be changed here.
-+
-+# LOG_MODE=0640
-+
-+
-+#------------------------------------------------------------------------------
-+# The TESTDB lookup is for performing tests on the handling of lookup results,
-+# and is not useful for general running. It should be included only when
-+# debugging the code of Exim.
-+
-+# LOOKUP_TESTDB=yes
-+
-+
-+#------------------------------------------------------------------------------
-+# /bin/sh is used by default as the shell in which to run commands that are
-+# defined in the makefiles. This can be changed if necessary, by uncommenting
-+# this line and specifying another shell, but note that a Bourne-compatible
-+# shell is expected.
-+
-+# MAKE_SHELL=/bin/sh
-+
-+
-+#------------------------------------------------------------------------------
-+# The maximum number of named lists of each type (address, domain, host, and
-+# local part) can be increased by changing this value. It should be set to
-+# a multiple of 16.
-+
-+# MAX_NAMED_LIST=16
-+
-+
-+#------------------------------------------------------------------------------
-+# Network interfaces: Unless you set the local_interfaces option in the runtime
-+# configuration file to restrict Exim to certain interfaces only, it will run
-+# code to find all the interfaces there are on your host. Unfortunately,
-+# the call to the OS that does this requires a buffer large enough to hold
-+# data for all the interfaces - it was designed in the days when a host rarely
-+# had more than three or four interfaces. Nowadays hosts can have very many
-+# virtual interfaces running on the same hardware. If you have more than 250
-+# virtual interfaces, you will need to uncomment this setting and increase the
-+# value.
-+
-+# MAXINTERFACES=250
-+
-+
-+#------------------------------------------------------------------------------
-+# Per-message logs: While a message is in the process of being delivered,
-+# comments on its progress are written to a message log, for the benefit of
-+# human administrators. These logs are held in a directory called "msglog"
-+# in the spool directory. Its mode defaults to 0750, but can be changed here.
-+# The message log directory is also used for storing files that are used by
-+# transports for returning data to a message's sender (see the "return_output"
-+# option for transports).
-+
-+# MSGLOG_DIRECTORY_MODE=0750
-+
-+
-+#------------------------------------------------------------------------------
-+# There are three options which are used when compiling the Perl interface and
-+# when linking with Perl. The default values for these are placed automatically
-+# at the head of the Makefile by the script which builds it. However, if you
-+# want to override them, you can do so here.
-+
-+# PERL_CC=
-+# PERL_CCOPTS=
-+# PERL_LIBS=
-+
-+
-+#------------------------------------------------------------------------------
-+# Identifying the daemon: When an Exim daemon starts up, it writes its pid
-+# (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/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".
-+
-+# If you start up a daemon without the -bd option (for example, with just
-+# the -q15m option), a pid file is not written. Also, if you override the
-+# configuration file with the -oX option, no pid file is written. In other
-+# words, the pid file is written only for a "standard" daemon.
-+
-+
-+#------------------------------------------------------------------------------
-+# If Exim creates the spool directory, it is given this mode, defaulting in the
-+# source to 0750.
-+
-+# SPOOL_DIRECTORY_MODE=0750
-+
-+
-+#------------------------------------------------------------------------------
-+# The mode of files on the input spool which hold the contents of messages can
-+# 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
-+
-+
-+#------------------------------------------------------------------------------
-+# Moving frozen messages: If the following is uncommented, Exim is compiled
-+# with support for automatically moving frozen messages out of the main spool
-+# directory, a facility that is found useful by some large installations. A
-+# run time option is required to cause the moving actually to occur. Such
-+# messages become "invisible" to the normal management tools.
-+
-+# SUPPORT_MOVE_FROZEN_MESSAGES=yes
-+
-+# End of EDITME for Exim 4.
+++ /dev/null
-diff -ruN exim-3.20.orig/src/EDITME exim-3.20/src/EDITME
---- exim-3.20.orig/src/EDITME Sat Nov 25 17:02:47 2000
-+++ exim-3.20/src/EDITME Tue Dec 5 09:28:44 2000
-@@ -92,8 +92,8 @@
- # appropriate code is included in the binary. You then need to set up the
- # runtime configuration to make use of the mechanism(s) selected.
-
--# AUTH_CRAM_MD5=yes
--# AUTH_PLAINTEXT=yes
-+AUTH_CRAM_MD5=yes
-+AUTH_PLAINTEXT=yes
-
-
- # The binary directory: This variable defines where the exim binary will be
-@@ -103,7 +103,7 @@
- # installed in this directory. There is no default for this variable built into
- # the source files; it must be set in one of the local configuration files.
-
--BIN_DIRECTORY=/usr/exim/bin
-+BIN_DIRECTORY=/usr/bin
-
-
- # The default distribution of Exim contains only the plain text form of the
-@@ -114,21 +114,21 @@
- # your info directory; "make install" will then build the info files and
- # install them there.
-
--# INFO_DIRECTORY=/usr/local/info
-+INFO_DIRECTORY=/usr/share/info
-
-
- # The compress command is used by the exicyclog script to compress old log
- # 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=/opt/gnu/bin/gzip
-+COMPRESS_COMMAND=/bin/gzip
- COMPRESS_SUFFIX=gz
-
-
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
-
--ZCAT_COMMAND=/opt/gnu/bin/zcat
-+ZCAT_COMMAND=/bin/zcat
-
-
- # The runtime configuration file: This variable defines where Exim's runtime
-@@ -137,7 +137,7 @@
- # location of all other runtime files and directories can be changed in the
- # runtime configuration file.
-
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=/etc/mail/exim.conf
-
-
- # In some installations there may be multiple machines sharing file systems,
-@@ -148,7 +148,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
-
-
- # In some esoteric configurations two different versions of Exim are run,
-@@ -229,8 +229,8 @@
- # "security" setting, which controls how privilege is released (setuid vs
- # seteuid).
-
--# EXIM_UID=
--# EXIM_GID=
-+EXIM_UID=79
-+EXIM_GID=79
-
-
- # Compiling the Exim monitor: If you want to compile the Exim monitor,
-@@ -284,7 +284,7 @@
- # "panic", or "reject" to form the final file name. For example, 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
-@@ -409,7 +410,7 @@
- # the file name, allowing sites that run two separate daemons to distinguish
- # them. Some installations may want something like this
-
--# PID_FILE_PATH=/var/lock/exim%s.pid
-+PID_FILE_PATH=/var/run/exim%s.pid
-
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
-@@ -458,7 +459,7 @@
- # uid and gid.
-
- # Many installations will want something like this:
--# SPOOL_DIRECTORY=/var/spool/exim
-+SPOOL_DIRECTORY=/var/spool/exim
-
- # Others may prefer to keep all Exim things under one directory:
- # SPOOL_DIRECTORY=/usr/exim/spool
-@@ -476,7 +477,7 @@
- # member of the Exim group, change the value to 0640. This is particularly
- # relevant if you are going to run the Exim monitor.
-
--# SPOOL_MODE=0600
-+SPOOL_MODE=0640
-
-
- # If STDERR_FILE is defined then the -df command line option causes Exim to
-@@ -490,9 +491,9 @@
- # of formats. The code for three specialist formats, maildir, mailstore, and
- # MBX, is included only when requested by the following settings:
-
--# SUPPORT_MAILDIR=yes
--# SUPPORT_MAILSTORE=yes
--# SUPPORT_MBX=yes
-+SUPPORT_MAILDIR=yes
-+SUPPORT_MAILSTORE=yes
-+SUPPORT_MBX=yes
-
-
- # Moving frozen messages: If the following is uncommented, Exim is compiled
-@@ -510,11 +511,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
-
- # Exim can be built to support the SMTP STARTTLS command, which implements
- # Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
-@@ -522,8 +524,8 @@
- # code of its own. Uncomment the following lines if you want to build Exim
- # with TLS support.
-
--# 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 usually all you need to do. You normally need to set up a
-@@ -565,7 +567,7 @@
- # This one is special-purpose, and commonly not required, so do not include
- # it by default.
-
--# TRANSPORT_LMTP=yes
-+TRANSPORT_LMTP=yes
-
-
- # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
+++ /dev/null
-diff -urN exim-3.30.org/OS/Makefile-Default exim-3.30/OS/Makefile-Default
---- exim-3.30.org/OS/Makefile-Default Sat Jun 30 00:58:22 2001
-+++ exim-3.30/OS/Makefile-Default Sat Jun 30 01:00:52 2001
-@@ -25,7 +25,7 @@
- # found, it uses /usr/ucb/basename. This copes with Solaris 2 and Linux, both
- # of which come in different versions.
-
--BASENAME_COMMAND=/usr/bin/basename
-+BASENAME_COMMAND=/bin/basename
-
-
- # If you set STRIP_COMMAND to the path of the "strip" command, it will be run
-@@ -38,8 +38,8 @@
- # Some of the following commands live in different places in different OS. We
- # include them all here for generality.
-
--CHOWN_COMMAND=/usr/bin/chown
--CHGRP_COMMAND=/usr/bin/chgrp
-+CHOWN_COMMAND=/bin/chown
-+CHGRP_COMMAND=/bin/chgrp
- MV_COMMAND=/bin/mv
- RM_COMMAND=/bin/rm
-
-@@ -149,7 +149,7 @@
- # parameters for include and library directories that may be needed for IPv6
- # on some systems.
-
--# HAVE_IPV6=YES
-+HAVE_IPV6=YES
- # IPV6_INCLUDE=-I /usr/ipv6/include
- # IPV6_LIBS=-L/usr/ipv6/libs -linet6
-
-@@ -259,7 +259,7 @@
-
- # X11 contains the location of the X11 libraries and include files.
-
--X11=/usr/X11R5
-+X11=/usr/X11R6
-
- # XINCLUDE contains options for header inclusion when compiling functions
- # that call X11 functions.
+++ /dev/null
---- exim.conf.orig Mon Jun 18 13:03:23 2001
-+++ exim.conf Sat Jun 30 13:10:36 2001
-@@ -106,7 +106,7 @@
- # calling its own SMTP port, is locked out by default. If you want to permit
- # relaying from the local host, you should set
- #
--# host_accept_relay = localhost
-+host_accept_relay = localhost
- #
- # If you want to permit relaying through your host from certain hosts or IP
- # networks, you need to set the option appropriately, for example
-@@ -196,6 +196,17 @@
-
- timeout_frozen_after = 7d
-
-+# This option unfrozes frozen messages after specified time. Some critical
-+# situations can be temporaty (such as DNS failures).
-+
-+auto_thaw = 12h
-+
-+# This emulates sendmails "newaliases". Keep in mind that the alias
-+# transport does use lsearch by default. remember to change this,
-+# if you want to use DBM-Lookups.
-+
-+bi_command=/usr/bin/newaliases
-+
- end
-
-
-@@ -224,9 +235,10 @@
- # 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
-+ file = ${home}/Mail/Mailbox
- delivery_date_add
- envelope_to_add
- return_path_add
-@@ -241,6 +253,21 @@
- # to complete normally. You can set different transports for aliases and
- # forwards if you want to - see the references to address_pipe in the directors
- # section below.
-+# Modification by Florian Wallner <wallner@speed-link.de> make use of
-+# procmail as director if a user has a .procmailrc to avoid breaking
-+# something that worked before.
-+
-+procmail:
-+ driver = pipe
-+ command = "/usr/bin/procmail -d ${local_part}"
-+# return_path_add
-+# delivery_date_add
-+# envelope_to_add
-+# check_string = "From "
-+# escape_string = ">From "
-+ user = $local_part
-+# group = mail
-+# group = $local_part
-
- address_pipe:
- driver = pipe
-@@ -292,9 +319,9 @@
-
- system_aliases:
- driver = aliasfile
-- file = /etc/aliases
-- search_type = lsearch
--# user = exim
-+ file = /var/spool/exim/db/aliases
-+ search_type = dbm
-+ user = exim
- file_transport = address_file
- pipe_transport = address_pipe
-
-@@ -331,6 +358,13 @@
-
-
- # This director matches local user mailboxes.
-+
-+
-+procmail:
-+ driver = localuser
-+ require_files = ${local_part}:${home}/.procmailrc
-+ transport = procmail
-+
-
- localuser:
- driver = localuser
+++ /dev/null
-diff -urN exim-3.15.orig/exim_monitor/EDITME exim-3.15/exim_monitor/EDITME
---- exim-3.15.orig/exim_monitor/EDITME Wed Jun 14 09:57:45 2000
-+++ exim-3.15/exim_monitor/EDITME Sat Jul 15 18:45:44 2000
-@@ -149,7 +149,7 @@
- # will be displayed as the second stripchart. This can be used to keep
- # a display of a mail spool partition on the screen.
-
--# SIZE_STRIPCHART=/var/mail
-+SIZE_STRIPCHART=/var/spool/exim
-
- # The name of the size stripchar will be the last component of SIZE_STRIPCHART
- # unless the following variable is set to override it.
+++ /dev/null
-diff -urN exim-texinfo-3.30.org/doc/filter.texinfo exim-texinfo-3.30/doc/filter.texinfo
---- exim-texinfo-3.30.org/doc/filter.texinfo Sat Jun 30 01:12:24 2001
-+++ exim-texinfo-3.30/doc/filter.texinfo Sat Jun 30 01:12:53 2001
-@@ -4,10 +4,19 @@
- @set{wmAuthor_email} <ph10@@cus.cam.ac.uk>
- @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge
- @c %**start of header
--@setfilename filter.info
-+@setfilename exim_filter.info
- @settitle Exim Filter Specification
- @paragraphindent 0
- @c %**end of header
-+
-+@ifinfo
-+@format
-+@dircategory Net utilities:
-+@direntry
-+* Exim Filters: (exim_filter). Message Transfer Agent
-+@end direntry
-+@end format
-+@end ifinfo
-
- @titlepage
- @title The Exim Mail Transfer Agent
-diff -urN exim-texinfo-3.30.org/doc/oview.texinfo exim-texinfo-3.30/doc/oview.texinfo
---- exim-texinfo-3.30.org/doc/oview.texinfo Sat Jun 30 01:12:24 2001
-+++ exim-texinfo-3.30/doc/oview.texinfo Sat Jun 30 01:12:53 2001
-@@ -4,10 +4,19 @@
- @set{wmAuthor_email} <ph10@@cus.cam.ac.uk>
- @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge
- @c %**start of header
--@setfilename oview.info
-+@setfilename exim_oview.info
- @settitle Exim Overview
- @paragraphindent 0
- @c %**end of header
-+
-+@ifinfo
-+@format
-+@dircategory Net utilities:
-+@direntry
-+* Exim Overview: (exim_oview). Message Transfer Agent
-+@end direntry
-+@end format
-+@end ifinfo
-
- @titlepage
- @title The Exim Mail Transfer Agent
-diff -urN exim-texinfo-3.30.org/doc/spec.texinfo exim-texinfo-3.30/doc/spec.texinfo
---- exim-texinfo-3.30.org/doc/spec.texinfo Sat Jun 30 01:12:24 2001
-+++ exim-texinfo-3.30/doc/spec.texinfo Sat Jun 30 01:12:54 2001
-@@ -4,10 +4,19 @@
- @set{wmAuthor_email} <ph10@@cus.cam.ac.uk>
- @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge
- @c %**start of header
--@setfilename spec.info
-+@setfilename exim.info
- @settitle Exim Specification
- @paragraphindent 0
- @c %**end of header
-+
-+@ifinfo
-+@format
-+@dircategory Net utilities:
-+@direntry
-+* Exim: (exim). Message Transfer Agent
-+@end direntry
-+@end format
-+@end ifinfo
-
- @titlepage
- @title The Exim Mail Transfer Agent
+++ /dev/null
-diff -urN exim-3.15.orig/OS/Makefile-Base exim-3.15/OS/Makefile-Base
---- exim-3.15.orig/OS/Makefile-Base Wed Jun 14 09:57:38 2000
-+++ exim-3.15/OS/Makefile-Base Sat Jul 22 12:35:24 2000
-@@ -79,7 +79,7 @@
- # This is the real default target for all the various exim binaries and
- # scripts, once the configuring stuff is done.
-
--allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \
-+allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
- ../util/exigrep ../util/eximstats ../util/exiqsumm \
- ../util/transport-filter.pl ../util/convert4r3 \
- exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \
-@@ -203,7 +203,7 @@
- route.o search.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
- store.o string.o tod.o transport.o tree.o verify.o $(EXIM_PERL)
-
--exim: libident/libident.a pcre/libpcre.a lookups/lookups.a auths/auths.a \
-+exim: libident/libident.a lookups/lookups.a auths/auths.a \
- directors/directors.a routers/routers.a transports/transports.a \
- $(OBJ_EXIM) version.c
- awk '{ print ($$1+1) }' cnumber.h > cnumber.temp
-@@ -211,7 +211,7 @@
- $(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) version.c
- /bin/rm -f exim
- $(PURIFY) $(CC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
-- libident/libident.a pcre/libpcre.a directors/directors.a \
-+ libident/libident.a -lpcre directors/directors.a \
- routers/routers.a transports/transports.a lookups/lookups.a \
- auths/auths.a \
- $(LIBS) $(IPV6_LIBS) $(EXTRALIBS) $(DBMLIB) $(LIBRESOLV) \
-@@ -283,12 +283,12 @@
-
- OBJ_MONBIN = dummies.o os.o spool_in.o store.o string.o tree.o $(MONBIN)
-
--eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
-+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
- ../exim_monitor/em_version.c
- $(CC) -o em_version.o -c \
- $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
- $(PURIFY) $(CC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
-- $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
-+ $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
- $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
- @echo " "
- @echo ">>> exim monitor binary built"
+++ /dev/null
---- exim.conf Thu Jul 19 18:24:41 2001
-+++ exim.conf-whoson Thu Jul 19 18:26:15 2001
-@@ -106,7 +106,8 @@
- # calling its own SMTP port, is locked out by default. If you want to permit
- # relaying from the local host, you should set
- #
-+# host_accept_relay = localhost : net-whoson;$key
- host_accept_relay = localhost
- #
- # If you want to permit relaying through your host from certain hosts or IP
- # networks, you need to set the option appropriately, for example
+++ /dev/null
-diff -uNr exim-3.31/exim-texinfo-3.30/doc/spec.texinfo exim-3.31-whoson/exim-texinfo-3.30/doc/spec.texinfo
---- exim-3.31/exim-texinfo-3.30/doc/spec.texinfo Thu Jul 19 18:41:19 2001
-+++ exim-3.31-whoson/exim-texinfo-3.30/doc/spec.texinfo Thu Jul 19 18:40:46 2001
-@@ -3586,6 +3586,7 @@
-
- LOOKUP_DBM=yes
- LOOKUP_LSEARCH=yes
-+LOOKUP_WHOSON=yes
- @end example
-
- which means that only linear searching and DBM lookups are included by default.
-@@ -3758,6 +3759,17 @@
- "More about dnsdb" below.
-
- @item
-+@dfn{whoson}: This is the lookup type that performs lookups for relay allowed
-+dialups using WHOSON (pop before smtp) service. You have to give it an IP
-+address of host in question. It returns username associated in WHOSON database
-+with queried IP address, or nothing, if given IP is unknown. Primary use is:
-+
-+@example
-+
-+host_relay_accept = localhost : net-whoson;$key
-+@end example
-+
-+@item
- @dfn{testdb}: This is a lookup type which is for use in debugging Exim. It is
- not likely to be useful in normal operation.
- @end itemize
-diff -uNr exim-3.31/scripts/MakeLinks exim-3.31-whoson/scripts/MakeLinks
---- exim-3.31/scripts/MakeLinks Mon Jul 2 11:46:41 2001
-+++ exim-3.31-whoson/scripts/MakeLinks Thu Jul 19 18:28:52 2001
-@@ -79,6 +79,8 @@
- ln -s ../../src/lookups/pgsql.c pgsql.c
- ln -s ../../src/lookups/testdb.h testdb.h
- ln -s ../../src/lookups/testdb.c testdb.c
-+ln -s ../../src/lookups/whoson.h whoson.h
-+ln -s ../../src/lookups/whoson.c whoson.c
- cd ..
-
- # Likewise for the code for the directors
-diff -uNr exim-3.31/src/EDITME exim-3.31-whoson/src/EDITME
---- exim-3.31/src/EDITME Thu Jul 19 18:41:19 2001
-+++ exim-3.31-whoson/src/EDITME Thu Jul 19 18:28:52 2001
-@@ -578,3 +578,5 @@
- # USE_TCP_WRAPPERS=yes
-
- # End of EDITME
-+
-+LOOKUP_WHOSON=yes
-diff -uNr exim-3.31/src/config.h.defaults exim-3.31-whoson/src/config.h.defaults
---- exim-3.31/src/config.h.defaults Mon Jul 2 11:46:41 2001
-+++ exim-3.31-whoson/src/config.h.defaults Thu Jul 19 18:28:52 2001
-@@ -106,3 +106,5 @@
- #define ROOT_UID 0
-
- /* End of config.h.defaults */
-+
-+#define LOOKUP_WHOSON
-diff -uNr exim-3.31/src/drtables.c exim-3.31-whoson/src/drtables.c
---- exim-3.31/src/drtables.c Mon Jul 2 11:46:42 2001
-+++ exim-3.31-whoson/src/drtables.c Thu Jul 19 18:28:52 2001
-@@ -75,6 +75,10 @@
- #include "lookups/testdb.h"
- #endif
-
-+#ifdef LOOKUP_WHOSON
-+#include "lookups/whoson.h"
-+#endif
-+
-
- /* The second field in each item below is a set of bit flags:
-
-@@ -325,6 +329,19 @@
- NULL, /* no close function */
- NULL, /* no tidy function */
- NULL /* no quoting function */
-+ },
-+#endif
-+
-+#ifdef LOOKUP_WHOSON
-+ {
-+ "whoson", /* lookup name */
-+ lookup_querystyle, /* query-style lookup */
-+ whoson_open, /* open function */
-+ NULL, /* check function */
-+ whoson_find, /* find function */
-+ NULL, /* no close function */
-+ NULL, /* no tidy function */
-+ NULL /* no quoting function */
- },
- #endif
-
-diff -uNr exim-3.31/src/lookups/Makefile exim-3.31-whoson/src/lookups/Makefile
---- exim-3.31/src/lookups/Makefile Mon Jul 2 11:46:43 2001
-+++ exim-3.31-whoson/src/lookups/Makefile Thu Jul 19 18:28:52 2001
-@@ -4,7 +4,7 @@
- # defined, dummy modules get compiled.
-
- OBJ = cdb.o dbmdb.o dnsdb.o ldap.o lsearch.o mysql.o nis.o nisplus.o pgsql.o \
-- testdb.o
-+ testdb.o whoson.o
-
- lookups.a: $(OBJ)
- /bin/rm -f lookups.a
-@@ -25,5 +25,6 @@
- nisplus.o: $(HDRS) nisplus.c nisplus.h
- pgsql.o: $(HDRS) pgsql.c pgsql.h
- testdb.o: $(HDRS) testdb.c testdb.h
-+whoson.o: $(HDRS) whoson.c whoson.h
-
- # End
-diff -uNr exim-3.31/src/lookups/whoson.c exim-3.31-whoson/src/lookups/whoson.c
---- exim-3.31/src/lookups/whoson.c Thu Jan 1 01:00:00 1970
-+++ exim-3.31-whoson/src/lookups/whoson.c Thu Jul 19 18:28:52 2001
-@@ -0,0 +1,57 @@
-+/*************************************************
-+* Exim - an Internet mail transport agent *
-+*************************************************/
-+
-+/* Copyright (c) University of Cambridge 1995 - 2001 */
-+/* See the file NOTICE for conditions of use and distribution. */
-+
-+#include <whoson.h>
-+
-+#include "../exim.h"
-+#include "whoson.h"
-+
-+
-+/*************************************************
-+* Open entry point *
-+*************************************************/
-+
-+/* See local README for interface description. */
-+
-+void *
-+whoson_open(char *filename, char **errmsg)
-+{
-+filename = filename; /* Keep picky compilers happy */
-+errmsg = errmsg;
-+return (void *)(1); /* Just return something non-null */
-+}
-+
-+
-+
-+/*************************************************
-+* Find entry point *
-+*************************************************/
-+
-+/* See local README for interface description. */
-+
-+int
-+whoson_find(void *handle, char *filename, char *query, int length,
-+ char **result, char **errmsg)
-+{
-+char buffer[80];
-+handle = handle; /* Keep picky compilers happy */
-+filename = filename;
-+length = length;
-+errmsg = errmsg;
-+
-+switch (wso_query(query,buffer,80)) {
-+case 0:
-+ *result = string_copy(buffer);
-+ return OK;
-+case -1:
-+ return DEFER;
-+default:
-+ return FAIL;
-+}
-+}
-+
-+/* End of lookups/whoson.c */
-diff -uNr exim-3.31/src/lookups/whoson.h exim-3.31-whoson/src/lookups/whoson.h
---- exim-3.31/src/lookups/whoson.h Thu Jan 1 01:00:00 1970
-+++ exim-3.31-whoson/src/lookups/whoson.h Thu Jul 19 18:28:52 2001
-@@ -0,0 +1,13 @@
-+/*************************************************
-+* Exim - an Internet mail transport agent *
-+*************************************************/
-+
-+/* Copyright (c) University of Cambridge 1995 - 2001 */
-+/* See the file NOTICE for conditions of use and distribution. */
-+
-+/* Header for the whoson lookup */
-+
-+extern void *whoson_open(char *, char **);
-+extern int whoson_find(void *, char *, char *, int, char **, char **);
-+
-+/* End of lookups/whoson.h */
+++ /dev/null
-.TH exim 8
-.SH exim
-exim \- Mail Transfer Agent
-.SH SYNOPSIS
-.B exim
-.I "[options] arguments ..."
-.br
-.B mailq
-.I "[options] arguments ..."
-.br
-.B rmail
-.I "[options] arguments ..."
-.br
-.B rsmtp
-.I "[options] arguments ..."
-.br
-.B runq
-.I "[options] arguments ..."
-.br
-.B sendmail
-.I "[options] arguments ..."
-.SH "DESCRIPTION"
-.B Exim
-is a mail transport agent (MTA) developed at the University of
-Cambridge for use on Unix systems connected to the Internet. It is
-freely available under the terms of the GNU General Public Licence. In
-style it is similar to Smail 3, but its facilities are more extensive,
-and in particular it has some defences against mail bombs and
-unsolicited junk mail, in the form of options for refusing messages
-from particular hosts, networks, or senders.
-.PP
-Exim's command line takes the standard Unix form of a sequence of
-options, each starting with a hyphen character, followed by a number
-of arguments. The options are compatible with the main options of
-Sendmail, and there are also some additional options, some of which
-are compatible with Smail 3. Certain combinations of options do not
-make sense, and provoke an error if used. The form of the arguments
-depends on which options are set.
-.PP
-If Exim is called under the name mailq, it behaves as if the option
--bp were present before any other options. This is for compatibility
-with some systems that contain a command of that name in one of the
-standard libraries, symbolically linked to /usr/lib/sendmail.
-.PP
-If Exim is called under the name rsmtp it behaves as if the option -bS
-were present before any other options, for compatibility with
-smail. The -bS option is used for reading in a number of messages in
-batched SMTP format.
-.PP
-If Exim is called under the name rmail it behaves as if the option -i
-were present before any other options, for compatibility with
-smail. The -i option is used for reading a message that should not be
-terminated by a dot on a line by itself. The name rmail is used as an
-interface by some UUCP systems.
-.PP
-If Exim is called under the name runq it behaves as if the option -q
-were present before any other options, for compatibility with
-smail. The -q option causes a single queue-runner process to be
-started.
-.SH LIMITATIONS
-For the benefit of those reading this overview to see whether Exim is
-of interest to them, its limitations are listed first.
-.TP
-.B ANSI-C
-Exim is written in ANSI C. This should not be much of a limitation
-these days. However, to help with systems that lack a true ANSI C
-library, Exim avoids making any use of the value returned by the
-sprintf() function, which is one of the main incompatibilities. It has
-its own version of strerror() for use with SunOS4 and any other system
-that lacks this function, and a macro can be defined to turn memmove()
-into bcopy() if necessary.
-.TP
-.B Filenames
-Exim uses file names that are longer than 14 characters.
-.TP
-.B Bangpaths
-Exim is intended for use as an Internet mailer, and therefore handles
-addresses in RFC 822 domain format only. It cannot handle 'bang
-paths', though simple two-component bang paths can be converted by a
-straightforward rewriting configuration.
-.TP
-.B Domains required
-Exim insists that every address it handles has a domain attached. For
-incoming local messages, domainless addresses are automatically
-qualified with a configured domain value. Configuration options
-specify from which remote systems unqualified addresses are
-acceptable.
-.TP
-.B Transports
-The only external transport currently implemented is an SMTP transport
-over a TCP/IP network (using sockets), suitable for machines on the
-Internet. However, a pipe transport is available, and there are
-facilities for writing messages to files in 'batched SMTP' format;
-this can be used to send messages to some other transport
-mechanism. Batched SMTP input is also catered for.
-.SH FEATURES
-Exim follows the same general approach of decentralized control that
-Smail 3 does. There is no central process doing overall management of
-mail delivery. However, unlike Smail, the independent delivery
-processes share data in the form of 'hints', which makes delivery more
-efficient in some cases. The hints are kept in a number of DBM
-files. If any of these files are lost, the only effect is to change
-the pattern of delivery attempts and retries.
-.PP
-Many configuration options can be given as expansion strings, and as
-these can include file lookups, much of Exim's operation can be made
-table-driven if desired. For example, it is possible to do local
-delivery on a machine on which the users do not have accounts.
-.PP
-Regular expressions are available in a number of configuration
-parameters.
-.PP
-Domain lists can include file lookups, making it possible to support a
-large number of local domains.
-.PP
-Exim has flexible retry algorithms, applicable to mail routing as well as
-to delivery.
-.PP
-Exim contains header and envelope rewriting facilities.
-.PP
-Unqualified addresses are accepted only from specified hosts or networks.
-.PP
-Exim can perform multiple deliveries down the same SMTP channel after
-deliveries to a host have been delayed.
-.PP
-Exim can be configured to do local deliveries immediately but to leave
-remote deliveries until the message is picked up by a queue-runner
-process. This increases the likelihood of multiple messages being sent
-down a single SMTP connection.
-.PP
-When copies of a message have to be delivered to more than one remote
-host, up to a configured maximum number of remote deliveries can be
-done in parallel.
-.PP
-Exim supports optional checking of incoming return path (sender) and
-receiver addresses as they are received by SMTP.
-.PP
-SMTP calls from specific machines, optionally from specific idents,
-can be locked out, and incoming SMTP messages from specific senders
-can also be locked out.
-.PP
-It is possible to control which hosts may use the Exim host as a relay
-for onward transmission of mail; the control can be made to depend on
-the address domain.
-.PP
-Messages on the queue can be 'frozen' and 'thawed' by the
-administrator.
-.PP
-The maximum size of message can be specified. Exim can handle a
-number of independent local domains on the same machine; each domain
-can have its own alias files, etc. These are commonly called "virtual
-domains".
-.PP
-Exim stats a user's home directory before looking for a .forward file,
-in order to detect the case of a missing NFS mount.
-.PP
-Exim contains an optional built-in mail filtering facility. This
-enables users to set up their own mail filtering in a straightfoward
-manner without the need to run an external program. There can also be
-a system filter file that applies to all messages.
-.PP
-There is support for multiple user mailboxes controlled by prefixes or
-suffixes on the user name, either via the filter mechanism or through
-multiple .forward files.
-.PP
-Periodic warnings are automatically sent to messages' senders when
-delivery is delayed - the time between warnings is configurable.
-.PP
-A queue run can be manually started to deliver just a particular
-portion of the queue, or those messages with a recipient whose address
-contains a given string.
-.PP
-Exim can be configured to run as root all the time, except when
-performing local deliveries, which it always does in a separate
-process under an appropriate uid and gid. Alternatively, it can be
-configured to run as root only when needed; in particular, it need not
-run as root when receiving incoming messages or when sending out
-messages over SMTP.
-.PP
-I have tried to make the wording of delivery failure messages clearer
-and simpler, for the benefit of those less-experienced people who are
-now using email.
-.PP
-The Exim Monitor is an optional extra; it displays information about
-Exim's processing in an X window, and an administrator can perform a
-number of control actions from the window interface.
-.SH METHOD OF OPERATION
-When Exim receives a message, it writes two files in its spool
-directory. The first contains the envelope information, the current
-status of the message, and the headers, while the second contains the
-body of the message. The status of the message includes a complete
-list of recipients and a list of those that have already received the
-message. The header file gets updated during the course of delivery if
-necessary.
-.PP
-A message remains in the spool directory until it is completely
-delivered to its recipients or to an error address, or until it is
-deleted by an administrator or by the user who originally created
-it. In cases when delivery cannot proceed - for example, when a
-message can neither be delivered to its recipients nor returned to its
-sender, the message is marked 'frozen' on the spool, and no more
-deliveries are attempted. The administrator can thaw such messages
-when the problem has been corrected, and can also freeze individual
-messages by hand if necessary.
-.PP
-As delivery proceeds, Exim writes timestamped information about each
-address to a per-message log file; this includes any delivery error
-messages. This log is solely for the benefit of the administrator. All
-the information Exim itself needs for delivery is kept in the header
-spool file. The message log file is deleted with the spool files. If a
-message is delayed for more than a configured time, a warning message
-is sent to the sender. This is repeated whenever the same time elapses
-again without delivery being complete.
-.PP
-The main delivery processing elements of Exim are called directors,
-routers, and transports. Code for a number of these is provided, and
-compile-time options specify which ones are actually included in the
-binary. Directors handle addresses that include one of the local
-domains, routers handle remote addresses, and transports do actual
-deliveries.
-.SH TRUSTED AND ADMIN USERS
-Some Exim options are available only to "trusted users" and others are
-available only to "admin users".
-.PP
-A trusted user is root or the Exim user (if defined) or any user
-listed in the trusted_users configuration option, or any user, if the
-currently set group is one of those listed in the trusted_groups
-configuration option. Trusted users are permitted to use the -f option
-to specify the senders of messages that are passed to Exim through the
-local interface, and also to specify host names, host addresses,
-protocol names, and ident values. Thus they are able to insert
-messages into Exim's queue locally that have the characteristics of
-messages received from a remote host.
-.PP
-An admin user is root or the Exim user (if defined) or any user that
-is a member of the Exim group (if defined). The current group does not
-have to be the Exim group. Admin users are permitted to operate on
-messages in the queue, for example, to force delivery failures. It is
-also necessary to be an admin user in order to see the full
-information provided by the Exim monitor.
-.SH OPTIONS
-Exim's command options are as follows:
-.TP
-.B -bd
-Run Exim as a daemon, awaiting incoming SMTP connections. This option
-can be used only by an admin user. If either of the -d or -dm options
-are set, the daemon does not disconnect from the controlling
-terminal. By default, Exim listens for incoming connections on all the
-host's interfaces, but it can be restricted to specific interfaces by
-setting the local_interfaces option in the configuration file. The
-standard SMTP port is used, but this can be varied by means of the -oX
-option. Most commonly, the -bd option is combined with the -q<time>
-option, to cause periodic queue runs to happen as well.
-
-The process id of a daemon that is both listening and starting queue
-runners is written to a file called exim-daemon.pid in Exim's spool
-directory, unless the -oX option is used, in which case the file
-name is exim-daemon.<port-number>.pid. If a daemon is run with only
-one of -bd and -q<time>, then that option is added on to the end of
-the file name, allowing sites that run two separate daemons to
-distinguish them.
-
-It is possible to change the directory in which these pid files are
-written by changing the setting of PID_FILE_PATH in Local/Makefile.
-Further details are given in the comments in src/EDITME.
-
-The SIGHUP signal can be used to cause the daemon to re-exec itself.
-This should be done whenever Exim's configuration file is changed,
-or a new version of Exim is installed. It is not necessary to do
-this when other files (e.g. alias files) are changed.
-.TP
-.B -bf <filename>
-Run Exim in filter testing mode; the file is the filter file to be
-tested, and a test message must be supplied on the standard input.
-If there are no message-dependent tests in the filter, an empty file
-can be supplied. If the test file does not begin with the special
-line
-
- # Exim filter
-
-then it is taken to be a normal .forward file, and is tested for
-validity under that interpretation. The result of this command,
-provided no errors are detected, is a list of the actions that Exim
-would try to take if presented with the message for real. More
-details of filter testing are given in the separate document
-entitled "Exim's User interface to mail filtering".
-
-When testing a filter file, various parameters that would normally
-be taken from the envelope recipient address of a message can be set
-by means of additional command line options. These are:
-
- -bfd <domain> default is the qualify domain
- -bfl <local_part>default is the logged in user
- -bfp <local_part_prefix> default is null
- -bfs <local_part_suffix> default is null
-
-The local part should always be set to the incoming address with any
-prefix or suffix stripped, because that is how it appears when a
-message is actually being delivered.
-.TP
-.B -bi
-Sendmail interprets the -bi option as a request to rebuild its alias
-file. Exim does not have the concept of a single alias file, and so
-it cannot mimic this behaviour. However, calls to /usr/lib/sendmail
--bi tend to appear in various scripts such as NIS make files, so the
-option must be recognized.
-
-If -bi is encountered, the command specified by the bi_command
-configuration option is run, under the uid and gid of the caller of
-Exim. If the -oA option is used, its value is passed to the command
-as an argument. The command set by bi_command may not contain
-arguments. The command can use the exim_dbmbuild utility, or some
-other means, to rebuild alias files if this is required. If the
-bi_command option is not set, then calling Exim with -bi is a no-op.
-.TP
-.B -bm
-Accept an incoming, locally-generated message on the current input,
-and deliver it to the addresses given as the command arguments
-(except when -t is also given - see below). Each argument can be a
-comma-separated list of RFC 822 addresses. This is the default
-option, and is assumed if no other conflicting option is present.
-The message may or may not be delivered immediately, depending on
-the setting of the -od option and the queue_only and queue_smtp
-configuration options.
-
-The format of the message must be as defined in RFC 822, except
-that, for compatibility with sendmail and smail, a line of the form
-
- From sender Fri Jan 5 12:55 GMT 1996
-
-is permitted to appear at the start of the message. The Solaris 2
-version of the "mail" command inserts such a line, though there is
-no mention of it in the sendmail man page. The sender specified in
-this line is treated as if it were given as the argument to the -f
-option.
-.TP
-.B -bp
-List the contents of the mail queue on the current output. Each
-message on the queue is displayed as in the following example:
-
- 25m 2.9K 0t5C6f-0000c8-00 <alice@wonderland.fict.book>
- red.king@looking-glass.fict.book
- <other addresses>
-
-The first line contains the amount of time the message has been on
-the queue (in this case 25 minutes), the size of the message (2.9K),
-the unique identifier for the message, and the message sender, as
-contained in the envelope. If the message is a delivery error
-message, the sender address is empty, and appears as <>. If the
-message is frozen (attempts to deliver it are suspended) then the
-text '*** frozen ***' is displayed at the end of this line.
-
-The recipients of the message (taken from the envelope, not the
-headers) are displayed on subsequent lines. Those addresses to which
-the message has already been delivered are marked with the letter D.
-If an original address gets expanded into several addresses via an
-alias or forward file, the original is displayed with a 'D' when
-deliveries for all of its child addresses are completed.
-.TP
-.B -bP
-If this option is given with no arguments, it causes the values of
-all Exim's main configuration options to be written to the standard
-output. The values of one or more specific options can be requested
-by giving their names as arguments, for example:
-
- exim -bP qualify_domain local_domains
-
-If configure_file is given, the name of the runtime configuration
-file is output. If log_file_path or pid_file_path are given, the
-names of the directories where log files and daemon pid files are
-written are output, respectively. If these values are unset, log
-files are written in a subdirectory of the spool directory called
-log, and pid files are written directly into the spool directory.
-
-If one of the words director, router, or transport is given,
-followed by the name of an appropriate driver instance, the option
-settings for that driver are output. For example:
-
- exim -bP transport local_delivery
-
-The generic driver options are output first, followed by the
-driver's private options. A list of the names of drivers of a
-particular type can be obtained by using one of the words
-director_list, router_list, or transport_list, and a complete list
-of all drivers with their option settings can be obtained by using
-directors, routers, or drivers.
-.TP
-.B -brt
-This option is for testing retry rules, and it must be followed by
-up to three arguments. It causes Exim to look for a retry rule that
-matches the values and to output it on the standard output. For
-example:
-
- exim -brt bach.comp.mus
- Retry rule: *.comp.mus F,2h,15m; FG,4d,30m;
-
-See chapter 30 for a description of Exim's retry rules. The first
-argument, which is required, can be a complete address in the form
-local_part@domain, or it can be just a domain name. The second
-argument is an optional second domain name; if no retry rule is
-found for the first argument, the second is tried. This ties in with
-Exim's behaviour when looking for retry rules for remote hosts - if
-no rule is found that matches the host, one that matches the mail
-domain is sought. The final argument is the name of a specific
-delivery error, as used in setting up retry rules, for example
-'quota_3d'.
-.TP
-.B -brw
-This option is for testing address rewriting rules, and it must be
-followed by a single argument, consisting of either a local part
-without a domain, or a complete address with a fully-qualified
-domain. Exim outputs how this address would be rewritten for each
-possible place it might appear.
-.TP
-.B -bS
-This option is used for batched SMTP input, where messages have been
-received from some external source by an alternative transport
-mechanism. It causes Exim to accept one or more messages by reading
-SMTP on the standard input, but to generate no responses. All errors
-are reported by sending mail. If the caller is trusted, then the
-senders in the MAIL FROM commands are believed; otherwise the sender
-is always the caller of Exim. Unqualified senders and receivers are
-not rejected (there seems little point) but instead just get
-qualified. Receiver verification and administrative rejection is not
-done, even if configured. HELO and EHLO act as RSET; VRFY, EXPN, ETRN,
-HELP, and DEBUG act as NOOP; QUIT quits.
-.TP
-.B -bs
-This option causes Exim to accept one or more messages by reading SMTP
-commands on the standard input, and producing SMTP replies on the
-standard output. Some user agents use this interface as a way of
-passing locally-generated messages to the MTA. The option can also be
-used to run Exim from inetd, as an alternative to using a listening
-daemon, in which case the standard input is the connected socket. Exim
-distinguishes between the two cases by attempting to read the IP
-address of the peer connected to the standard input. If it is not a
-socket, the call to getpeername() fails, and Exim assumes it is
-dealing with a local message.
-
-If the caller of Exim is trusted, then the senders of messages are
-taken from the SMTP MAIL FROM commands. Otherwise the content of these
-commands is ignored and the sender is set up as the calling user.
-.TP
-.B -bt
-Run in address testing mode, in which each argument is taken as an
-address to be tested. The results are written to the standard
-output. If no arguments are given, Exim runs in an interactive manner,
-prompting with > for addresses to be tested. Each address is handled
-as if it were the recipient address on a message and passed to the
-appropriate directors or routers.
-.TP
-.B -bV
-Write the current version number, compilation number, and compi-
-lation date of the exim binary to the standard output.
-.TP
-.B -bv
-Verify the addresses that are given as the arguments to the command,
-and write the results to the standard output. Verification differs
-from address testing (the -bt option) in that directors and routers
-that have no_verify set are skipped, and if the address is accepted by
-a director or router that has fail_verify set, verification
-fails. This is the same logic that is used when verifying addresses on
-incoming messages (see the sender_verify and receiver_verify options).
-
-If the -v (or -d) option is not set, the output consists of a single
-line for each address, stating whether it was verified or not, and
-giving a reason in the latter case. Otherwise, more details are given
-of how the address has been handled, and in the case of aliases or
-forwarding, the generated addresses are also considered.
-.TP
-.B -C <filename>
-Read the runtime configuration from the given file instead of from
-the default file specified by the CONFIGURE_FILE compile-time set-
-ting. When this option is used by an unprivileged caller, Exim gives
-up its root privilege immediately, and runs with the real and
-effective uid and gid set to those of the caller, to avoid any
-security exposure. It does not do this if the caller is root or the
-exim user. The facility is useful for ensuring that configuration
-files are syntactically correct, but cannot be used for test
-deliveries, unless the caller is privileged, or unless it's an
-exotic configuration that does not require privilege. No check is
-made on the owner or group of the file specified by this option.
-.TP
-.B -d<number>
-Sets a debug level, causing debugging information to be written to the
-standard error file. Whitespace between -d and the number is
-optional. If no number is given, 1 is assumed, and the higher the
-number, the more output is produced. A value of zero turns debugging
-output off. A value of 9 gives the maximum amount of general
-information, 10 gives in addition details of the interpretation of
-filter files, and 11 or higher also turns on the debugging option for
-DNS lookups.
-.TP
-.B -df
-If this option is set and STDERR_FILE was defined when Exim was built,
-debugging information is written to the file defined by that variable
-instead of to the standard error file. This option provides a way of
-obtaining debugging information when Exim is run from inetd.
-.TP
-.B -dm
-This option causes information about memory allocation and freeing
-operations to be written to the standard error file.
-.TP
-.B -E
-This option specifies that an incoming message is a locally-generated
-delivery failure message. It is used internally by Exim when handling
-delivery failures and is not intended for external use. Its only
-effect is to stop Exim generating certain messages to the mailmaster,
-as otherwise message cascades could occur in some situations. As part
-of the same option, a message id may follow the characters -E. If it
-does, the log entry for the receipt of the new message contains the
-id, following 'R=', as a cross reference.
-.TP
-.B -ex
-There are a number of sendmail options starting with -oe which seem to
-be called by various programs without the leading o in the option. For
-example, the vacation program uses -eq. Exim treats all options of the
-form -ex as synonymous with the corresponding -oex options.
-.TP
-.B -F <string>
-Set the sender's full name for use when a locally-generated message
-is being accepted. In the absence of this option, the user's "gecos"
-entry from the password file is used. As users are generally
-permitted to alter their "gecos" entries, no security considerations
-are involved. White space between -F and the <string> is optional.
-.TP
-.B -f <address>
-Set the address of the sender of a locally-generated message. This
-option can normally be used only by root or the Exim user or by one
-of the configured trusted users. In other cases, the sender of a
-local message is always set up as the user who ran the exim command,
-and -f is ignored, with one exception. If the special setting -f <>
-is used by an untrusted user, it does not affect the sender for the
-purposes of managing the Sender: and From: headers, but it does have
-the effect of causing any SMTP transmissions to be sent out with
-
- MAIL FROM: <>
-
-and local deliveries to contain
-
- Return-path: <>
-
-when configured to contain Return-path: headers. The filtering code
-treats such a message as an error message, and won't generate
-messages as a result of reading it.
-
-White space between -f and the <string> is optional. The sender of a
-locally-generated message can also be set by an initial 'From' line
-in the message - see the description of -bm above.
-.TP
-.B -h <number>
-This option is accepted for compatibility with sendmail, but at
-present has no effect. (In sendmail it overrides the 'hop count'
-obtained by counting Received headers.)
-.TP
-.B -i
-This option, which has the same effect as -oi, specifies that a dot
-on a line by itself should not terminate an incoming, non-SMTP
-message. I can find no documentation for this option in Solaris 2.4
-sendmail, but the mailx command in Solaris 2.4 uses it.
-.TP
-.B -M
-The arguments are interpreted as a list of message ids, and Exim runs
-a delivery attempt on each message in turn. Retry hints for any of the
-addresses are overridden - this option forces Exim to try to deliver
-even if the normal retry time has not yet been reached. If any of the
-messages is frozen, it is automatically thawed before the delivery
-attempt, provided that the caller is an admin user.
-.TP
-.B -Mar <message-id> <address> <address> ...
-The first argument must be a message id, and the remaining ones must
-be email addresses. Exim adds the addresses to the list of recipi-
-ents of the message. However, if the message is active (in the middle
-of a delivery attempt), its status is not altered. This option can be
-used only by an admin user.
-.TP
-.B -Meb <message-id>
-This runs, under /bin/sh, the command defined in the shell variable
-VISUAL or, if that is not defined, EDITOR or, if that is not defined,
-the command vi, on a copy of the spool file containing the body of
-message (eb = Edit Body). If the editor exits normally, then the
-result of editing replaces the spool file. The message is locked
-during this process, so no delivery attempts can occur. Note that the
-first line of the spool file is its own name; care should be taken not
-to disturb this. The thinking behind providing this feature is that an
-administrator who has had to mess around with the addresses to get a
-message delivered might want to add some (grumbly) comment at the
-start of the message text. This option can be used only by an admin
-user.
-.TP
-.B -Mes <message-id> <address>
-There must be exactly two arguments. The first argument must be a
-message id, and the second one an email address. Exim changes the
-sender address in the message to the given address, which must be a
-fully qualified address, or '<>'. However, if the message is active
-(in the middle of a delivery attempt), its status is not altered.
-This option can be used only by an admin user.
-.TP
-.B -Mmad <message-id>
-Exim marks the all recipient addresses in the message as already
-delivered. However, if the message is active (in the middle of a
-delivery attempt), its status is not altered. This option can be used
-only by an admin user.
-.TP
-.B -Mmd <message-id> <address> <address> ...
-The first argument must be a message id, and the remaining ones must
-be email addresses. Exim marks the given addresses as already
-delivered. However, if the message is active (in the middle of a
-delivery attempt), its status is not altered. This option can be used
-only by an admin user.
-.TP
-.B -MC <transport> <hostname> <sequence number> <message id>
-This option is not intended for use by outside callers. It is used
-internally by Exim to invoke another instance of itself to deliver a
-waiting message using an existing SMTP channel, which is passed as the
-standard input and output. Details are given in chapter 43. This must
-be the final option, and the caller must be root or the Exim user in
-order to use it.
-.TP
-.B -Mc
-The arguments are interpreted as a list of message ids, and Exim runs
-a delivery attempt on each message in turn, but unlike the -M option,
-it does check for retry hints, and respects any that are found. This
-option is not very useful to external callers (except for testing). It
-is provided for internal use by Exim when it needs to re-invoke itself
-in order to regain root privilege for a delivery (see chapter 44).
-.TP
-.B -Mf
-The arguments are interpreted as a list of message ids, and each
-message is marked 'frozen'. This prevents any delivery attempts taking
-place until the message is 'thawed', either manually or as a result of
-the auto_thaw configuration option. However, if any of the messages is
-active (in the middle of a delivery attempt), its status is not
-altered. This option can be used only by an admin user.
-.TP
-.B -Mg
-The arguments are interpreted as a list of message ids, and Exim gives
-up trying to deliver those messages. A delivery error message is sent,
-containing the text 'cancelled by administrator'. However, if any of
-the messages is active, its status is not altered. This option can be
-used only by an admin user.
-.TP
-.B -Mt
-The arguments are interpreted as a list of message ids, and each
-message that was 'frozen' is now 'thawed', so that delivery attempts
-can resume. However, if any of the messages is active, its status is
-not altered. This option can be used only by an admin user.
-.TP
-.B -Mrm
-The arguments are interpreted as a list of message ids, and each
-message is completely removed from Exim's queue, and forgotten.
-However, if any of the messages is active, its status is not
-altered. This option can be used only by an admin user or by the user
-who originally caused the message to be placed on the queue.
-.TP
-.B -m
-This is apparently a synonym for -om that is accepted by sendmail, so
-Exim treats it that way too.
-.TP
-.B -N
-This is a debugging option that inhibits delivery of a message at the
-transport level. It implies at least -d1. Exim goes through many of
-the motions of delivery - it just doesn't actually transport the
-message, but instead behaves as if it had successfully done so. The
-log, for example, will contain entries as if the message had been
-delivered. Only root or the exim user are allowed to use -N with -bd,
--q, or -M. In other words, an ordinary user can use it only when
-supplying an incoming message.
-.TP
-.B -oA <file name>
-This option is used by Sendmail in conjunction with -bi to specify an
-alternative alias file name. Exim handles -bi differently; see the
-description above.
-.TP
-.B -oB <n>
-This is a debugging option which limits the maximum number of SMTP
-deliveries down one channel to <n>, overriding the value set in the
-smtp transport. If <n> is omitted, the limit is set to 1 (no
-batching).
-.TP
-.B -odb
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It requests 'background'
-delivery of such messages, which means that the accepting process
-automatically starts another delivery process for each message
-received. Exim does not wait for such processes to complete (it can
-take some time to perform SMTP deliveries). This is the default action
-if none of the -od options are present.
-.TP
-.B -odf
-This option (compatible with smail) requests 'foreground' (syn-
-chronous) delivery when Exim has accepted a locally-generated mess-
-age. For the daemon it is exactly the same as -odb. For a single
-message received on the standard input, if the protection regime
-permits it (see chapter 44), Exim converts the reception process into
-a delivery process. In other cases, it creates a new delivery process,
-and then waits for it to complete before proceeding.
-.TP
-.B -odi
-This option is synonymous with -odf. It is provided for compati-
-bility with sendmail.
-.TP
-.B -odq
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It specifies that the
-accepting process should not automatically start a delivery attempt
-for each message received. Messages are placed on the queue, and
-remain there until a subsequent queue-running process encounters
-them. The queue_only configuration option has the same effect.
-.TP
-.B -odqr
-This option applies to all modes in which Exim accepts incoming
-messages, including the listening daemon. It causes Exim to process
-local addresses when a message is received, but not even to try
-routing remote addresses. Contrast with -odqs below, which does the
-routing, but not the delivery. The remote addresses will be picked up
-by the next queue runner. The queue_remote configuration option has
-the same effect.
-.TP
-.B -odqs
-This option is a hybrid between -odb and -odq. A delivery process is
-started for each incoming message, the addresses are all processed,
-and local deliveries are done in the normal way. However, if any SMTP
-deliveries are required, they are not done at this time. Such messages
-remain on the queue until a subsequent queue-running process
-encounters them. Because routing was done, Exim knows which messages
-are waiting for which hosts, and so a number of messages for the same
-host will get sent in a single SMTP connection. The queue_smtp
-configuration option has the same effect.
-.TP
-.B -oem
-If an error is detected while a non-SMTP message is being received
-(e.g. a malformed address), the error is reported to the sender in a
-mail message. This is the default option. After a message has been
-successfully received, any subsequent delivery errors are always
-reported in this way.
-.TP
-.B -oep
-If an error is detected while a non-SMTP message is being received,
-the error is reported by writing a message to the standard error file
-(stderr).
-.TP
-.B -oeq
-This option is supported for compatibility with sendmail, but has the
-same effect as -oep.
-.TP
-.B -oew
-This option is supported for compatibility with sendmail, but has the
-same effect as -oem.
-.TP
-.B -oi
-This option, which has the same effect as -i, specifies that a dot on
-a line by itself should not terminate an incoming, non-SMTP message.
-.TP
-.B -oMa <host address>
-This option sets the sender host address value, and can be used only
-by a trusted caller. The value is used in log entries and can appear
-in Received headers. The option is intended for use when handing to
-Exim messages received by other means.
-.TP
-.B -oMr <protocol name>
-This option sets the received protocol value, and can be used only by
-a trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -oMs <host name>
-This option sets the sender host name value, and can be used only by a
-trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -oMt <ident string>
-This option sets the sender ident value, and can be used only by a
-trusted caller. The value is used in log entries and can appear in
-Received headers. The option is intended for use when handing to Exim
-messages received by other means.
-.TP
-.B -om
-In sendmail, this option means 'me too', indicating that the sender of
-a message should receive a copy of the message if the sender appears
-in an alias expansion. Exim always does this, so the option does
-nothing.
-.TP
-.B -or <time>
-This option sets a timeout value for incoming non-SMTP messages. If it
-is not set, Exim will wait forever for the standard input. The value
-can also be set using the accept_timeout configuration vari- able. The
-format used for specifying times is described in section 7.6.
-.TP -ov
-This option has exactly the same effect as -v.
-.TP
-.B -oX <number>
-This option is relevant only when the -bd option is also given. It
-specifies an alternative TCP/IP port number for the listening daemon,
-and is useful for testing. When used, the process number of the daemon
-is written to a file whose name is exim- daemon.<number>.pid in Exim's
-spool directory.
-.TP
-.B -q
-If the -q option is not followed by a time value, it requests a single
-queue run operation. This option can be used only by an admin
-user. Exim starts up a delivery process for each (inactive) message on
-the queue in turn, and waits for it to finish before starting the next
-one. When all the queued messages have been considered, the original
-process terminates. In other words, a single pass is made over the
-waiting mail. Use -q with a time (see below) if you want this to be
-repeated periodically.
-
-Exim processes the waiting messages in an unpredictable order. It
-isn't very random, but it is likely to be different each time, which
-is all that matters. If one particular message screws up a remote MTA,
-other messages to the same MTA have a chance of getting through if
-they get tried first.
-
-However, it is possible to cause the messages to be processed in
-lexical id order, which is essentially the order in which they
-arrived, and to start this operation at a particular point by
-following the -q option with a starting message id. For example:
-
- exim -q 0t5C6f-0000c8-00
-
-This causes Exim to skip any messages whose ids are lexically less
-than the given id. A second id can also be given to stop the queue run
-before the end. See also the -R option.
-.TP
-.B -q <time>
-This version of the -q option (which again can be run only by an admin
-user) causes Exim to run as a daemon, starting a queue-running process
-at intervals specified by the given time value (whose format is
-described in section 7.6). This form of the -q option is commonly
-combined with the -bd option, in which case a single daemon process
-handles both functions. A common way of starting up a combined daemon
-at system boot time is to use a command such as
-
- /opt/exim/bin/exim -bd -q30m
-
-Such a daemon listens for incoming SMTP calls, and also fires up a
-queue-runner process every 30 minutes. The process id of such a daemon
-is written to a file called exim-daemon.pid in Exim's spool directory,
-unless the -oX option has been used, in which case the file is called
-exim-daemon.<port-number>.pid. The location of the pid file can be
-changed by defining PID_FILE_PATH in Local/Makefile. If a daemon is
-started without -bd then the -q option used to start it is added to
-the pid file name.
-.TP
-.B -qf
-This option operates like -q, and may appear with or without a
-following time. The difference is that a delivery attempt is forced
-for each message, whereas with -q only those addresses that have
-passed their retry times are tried.
-.TP
-.B -qfl
-This option operates like -ql, and may appear with or without a
-following time. The difference is that a delivery attempt is forced
-for each message, whereas with -ql only those local addresses that
-have passed their retry times are tried.
-.TP
-.B -ql
-This option operates like -q, and may appear with or without a
-following time. The difference is that only local addresses are
-considered for delivery. Note that -ql cannot detect apparently remote
-addresses that actually turn out to be local when their domains get
-fully qualified.
-.TP -R <string>
-This option is similar to -q with no time value, except that, when
-scanning the messages on the queue, Exim processes only those that
-have at least one undelivered address containing the given string,
-which is checked in a case-independent way. However, once a message is
-selected, all its addresses are processed. For the first message
-containing a matching address, Exim overrides any retry information
-and forces a delivery attempt. This makes it straightforward to
-initiate delivery for all messages to a given domain after a host has
-been down for some time. When the SMTP command ETRN is permitted (see
-the smtp_etrn options), its effect is to run Exim with the -R option.
-.TP
-.B -r
-This is a documented (for sendmail) obsolete alternative name for -f.
-.TP
-.B -t
-When Exim is receiving a locally-generated, non-SMTP message on the
-current input, the -t option causes the recipients of the message to
-be obtained from the To, Cc, and Bcc headers in the message instead of
-from the command arguments. If there are any arguments, they specify
-addresses to which the message is not to be delivered. That is, the
-argument addresses are removed from the recipients list obtained from
-the headers. If a Bcc header is present, it is removed from the
-message unless there is no To or Cc header, in which case a Bcc header
-with no data is created, in accordance with RFC 822.
-.TP
-.B -v
-This option has exactly the same effect as -d1; it causes Exim to be
-'verbose' and produce some output describing what it is doing on the
-standard error file. In particular, if an SMTP connection is made, the
-SMTP dialogue is shown.
-.TP
-.B -x
-AIX uses -x for a private purpose ('mail from a local mail program has
-National Language Support extended characters in the body of the mail
-item'). It sets -x when calling the MTA from its mail command. Exim
-ignores this option.
-.SH "SEE ALSO"
-There is extensive documentation available in
-.I /usr/doc/exim
-and in the info system regarding exim.
-Debian users please be sure to have the
-.B exim-doc
-package installed.
-.SH AUTHOR
-This manual page was stitched together by Christoph Lameter,
-<clameter@debian.org>, from the original documentation coming with the
-sourcepackage for the Debian GNU/Linux system, and cleaned up a little
-by Tim Cutts <tjrc1@scalopus.bio.cam.ac.uk>.
+++ /dev/null
-#%PAM-1.0
-auth required pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
-auth required pam_listfile.so item=user sense=deny file=/etc/security/blacklist.exim onerr=succeed
-auth required pam_unix.so
-auth required pam_tally.so deny=0 file=/var/log/faillog onerr=succeed
-auth required pam_nologin.so
-account required pam_tally.so file=/var/log/faillog onerr=succeed
-account required pam_unix.so
-session required pam_unix.so
+++ /dev/null
-diff -urN exim-4.21.org/src/daemon.c exim-4.21/src/daemon.c
---- exim-4.21.org/src/daemon.c 2003-08-18 00:04:37.000000000 +0200
-+++ exim-4.21/src/daemon.c 2003-08-18 00:04:54.000000000 +0200
-@@ -656,7 +656,7 @@
- */
-
- static BOOL
--check_special_case(int errno, ip_address_item *addresses, ip_address_item *ipa,
-+check_special_case(int eno, ip_address_item *addresses, ip_address_item *ipa,
- BOOL back)
- {
- ip_address_item *ipa2;
-@@ -667,7 +667,7 @@
-
- if (back)
- {
-- if (errno != EADDRINUSE || ipa->address[0] != 0) return FALSE;
-+ if (eno != EADDRINUSE || ipa->address[0] != 0) return FALSE;
- for (ipa2 = addresses; ipa2 != ipa; ipa2 = ipa2->next)
- if (ipa2->address[1] == 0 && ipa2->port == ipa->port)
- return TRUE;
+++ /dev/null
-diff -urN exim-4.42.org/src/exim.c exim-4.42/src/exim.c
---- exim-4.42.org/src/exim.c 2004-09-21 15:04:23.506142125 +0200
-+++ exim-4.42/src/exim.c 2004-09-21 15:08:08.497942908 +0200
-@@ -3551,7 +3551,7 @@
- delays are in evidence. Save the home directory for use in filter testing
- (only). */
-
--for (i = 1; i <= 10; i++)
-+for (i = 1; i <= (finduser_retries + 1); i++)
- {
- if ((pw = getpwuid(real_uid)) != NULL)
- {
-@@ -3620,7 +3620,8 @@
-
- break;
- }
-- sleep(1);
-+ if (finduser_retries)
-+ sleep(1);
- }
-
- /* If we cannot get a user login, log the incident and give up, unless the
+++ /dev/null
-diff -Nru exim-4.03.orig/OS/os.h-Linux exim-4.03/OS/os.h-Linux
---- exim-4.03.orig/OS/os.h-Linux Tue Apr 16 12:40:58 2002
-+++ exim-4.03/OS/os.h-Linux Tue Apr 16 13:26:26 2002
-@@ -11,9 +11,6 @@
- #define F_FREESP O_TRUNC
- typedef struct flock flock_t;
-
--#define HAVE_GETIPNODEBYNAME 1
--#define HAVE_GETIPNODEBYADDR 1
--
- #define os_strsignal strsignal
- #define OS_STRSIGNAL
-
+++ /dev/null
---- src/spf.h~ 2004-08-02 22:33:25.679145784 +0200
-+++ src/spf.h 2004-08-02 22:34:34.029754912 +0200
-@@ -10,9 +10,9 @@
-
- #ifdef SPF
-
--#include <spf_alt/spf.h>
--#include <spf_alt/spf_dns_resolv.h>
--#include <spf_alt/spf_dns_cache.h>
-+#include <spf2/spf.h>
-+#include <spf2/spf_dns_resolv.h>
-+#include <spf2/spf_dns_cache.h>
-
- typedef struct spf_result_id {
- uschar *name;
+++ /dev/null
-#!/usr/bin/perl
-#
-#From root@relay1.mail.uk.psi.net Mon Mar 23 10:54:54 1998
-#Date: Mon, 23 Mar 1998 10:51:14 +0000
-#From: Super-User <root@relay1.mail.uk.psi.net>
-#To: ph10@cus.cam.ac.uk
-#Subject: Contrib - single line mail queue printer in perl
-#
-#this simple hacked script produces the queue with one line per message,
-#to allow you to do the equivalent of
-# eximq1l | grep 'hotmail.com' | awk '{print $3}'
-#to extract the message IDs of interesting messages for nefarious purposes.
-#
-
-open ( MQ, "/usr/bin/exim -bp|") or die "can't run the exim command\n";
-
-
-$state = 0; # simple state machine
-$recips = 0;
-while ( <MQ> )
-{
- $line = $_;
- chop $line;
- if ($state == 0) # line read is the sender info
- {
- print "$line ";
- $state = 1;
- $recips = 0;
- }
- else # line read is a recip
- {
- if ($line =~ /^$/) # if blank, about to start new mail
- {
- $state = 0;
- print "\n";
- }
- else # append recipient to line
- {
- if ($recips > 0) # separate recipients with :
- {
- print ':';
- }
- if ($line =~ /^\s+\S\s+(.*)/)
- {
- print "$1";
- }
- elsif ($line =~ /^\s+(.*)/)
- {
- print "$1";
- }
- ++$recips;
- }
- }
-}
-
-# end
projects / packages / exim.git / commitdiff