From 719b785a40f935b9c4b3a20a20e1545518481653 Mon Sep 17 00:00:00 2001 From: kloczek Date: Wed, 3 Apr 2002 18:24:28 +0000 Subject: [PATCH] - patch is back. Changed files: exim-EDITME.patch -> 1.4 exim-Makefile-Default.patch -> 1.4 exim-conf.patch -> 1.7 exim-monitor-EDITME.patch -> 1.3 exim-texinfo.patch -> 1.6 exim-use_system_pcre.patch -> 1.3 exim-whoson-config.patch -> 1.4 exim-whoson.patch -> 1.4 --- exim-EDITME.patch | 160 ++++++++++++++++++++++++++++++ exim-Makefile-Default.patch | 41 ++++++++ exim-conf.patch | 90 +++++++++++++++++ exim-monitor-EDITME.patch | 12 +++ exim-texinfo.patch | 72 ++++++++++++++ exim-use_system_pcre.patch | 45 +++++++++ exim-whoson-config.patch | 11 +++ exim-whoson.patch | 190 ++++++++++++++++++++++++++++++++++++ 8 files changed, 621 insertions(+) create mode 100644 exim-EDITME.patch create mode 100644 exim-Makefile-Default.patch create mode 100644 exim-conf.patch create mode 100644 exim-monitor-EDITME.patch create mode 100644 exim-texinfo.patch create mode 100644 exim-use_system_pcre.patch create mode 100644 exim-whoson-config.patch create mode 100644 exim-whoson.patch diff --git a/exim-EDITME.patch b/exim-EDITME.patch new file mode 100644 index 0000000..95ba04c --- /dev/null +++ b/exim-EDITME.patch @@ -0,0 +1,160 @@ +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 diff --git a/exim-Makefile-Default.patch b/exim-Makefile-Default.patch new file mode 100644 index 0000000..b52f579 --- /dev/null +++ b/exim-Makefile-Default.patch @@ -0,0 +1,41 @@ +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. diff --git a/exim-conf.patch b/exim-conf.patch new file mode 100644 index 0000000..1cd215a --- /dev/null +++ b/exim-conf.patch @@ -0,0 +1,90 @@ +--- 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 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 diff --git a/exim-monitor-EDITME.patch b/exim-monitor-EDITME.patch new file mode 100644 index 0000000..e9b36cb --- /dev/null +++ b/exim-monitor-EDITME.patch @@ -0,0 +1,12 @@ +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. diff --git a/exim-texinfo.patch b/exim-texinfo.patch new file mode 100644 index 0000000..86084f4 --- /dev/null +++ b/exim-texinfo.patch @@ -0,0 +1,72 @@ +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} + @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} + @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} + @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 diff --git a/exim-use_system_pcre.patch b/exim-use_system_pcre.patch new file mode 100644 index 0000000..68b528e --- /dev/null +++ b/exim-use_system_pcre.patch @@ -0,0 +1,45 @@ +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" diff --git a/exim-whoson-config.patch b/exim-whoson-config.patch new file mode 100644 index 0000000..e8020c7 --- /dev/null +++ b/exim-whoson-config.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/exim-whoson.patch b/exim-whoson.patch new file mode 100644 index 0000000..efa9c44 --- /dev/null +++ b/exim-whoson.patch @@ -0,0 +1,190 @@ +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 ++ ++#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 */ -- 2.44.0