summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2004-07-19 17:49:09 +0000
committerStef Walter <stef@memberwebs.com>2004-07-19 17:49:09 +0000
commit7193299b2407a4ff6cea4c25a217857ace27f1e7 (patch)
tree8946b0c96b63961223f2cfdfb74a9f09d675c1ba
parentaba21d50ab7e88a05f17de05ba5dedab58a29616 (diff)
Miscellaneous fixes (lost track).
-rw-r--r--ChangeLog6
-rw-r--r--INSTALL229
-rw-r--r--Makefile.am2
-rw-r--r--common/compat.c99
-rw-r--r--common/compat.h4
-rw-r--r--common/smtppass.c2
-rw-r--r--configure.in4
-rw-r--r--scripts/clamsmtpd.sh42
-rw-r--r--src/clamsmtpd.c2
-rw-r--r--src/compat.c99
-rw-r--r--src/compat.h4
11 files changed, 449 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dbca55..b7569ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
0.2
+ - Initial public release
+ - Sliently dropping viruses is the default
+ - Limit to old SMTP (not ESMTP)
- Added logging
- Many bug fixes
- - Initial public release
+ - Adds a header to email
0.1
- Initial implementation
+
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..54caf7c
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
index 1a5cc97..f4143f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = config.sub acsite.m4 config.guess
+EXTRA_DIST = config.sub acsite.m4 config.guess scripts
SUBDIRS = src
dist-hook:
diff --git a/common/compat.c b/common/compat.c
index 54fd760..d3730e0 100644
--- a/common/compat.c
+++ b/common/compat.c
@@ -34,8 +34,37 @@
* CONTRIBUTORS
* Nate Nielsen <nielsen@memberwebs.com>
*
+ *
+ * PORTIONS FROM OPENBSD: -------------------------------------------------
+ *
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+
#include "usuals.h"
#include "compat.h"
@@ -81,34 +110,70 @@ char* strupr(char* s)
#ifndef HAVE_STRLCPY
-#ifndef HAVE_STRNCPY
-#error neither strncpy or strlcpy found
-#endif
-
-void strlcpy(char* dest, const char* src, size_t count)
+size_t strlcpy(char* dst, const char* src, size_t siz)
{
- if(count > 0)
- {
- strncpy(dest, src, count);
- dest[count - 1] = 0;
+ char* d = dst;
+ const char* s = src;
+ size_t n = siz;
+
+ /* Copy as many bytes as will fit */
+ if(n != 0 && --n != 0)
+ {
+ do
+ {
+ if((*d++ = *s++) == 0)
+ break;
}
+ while(--n != 0);
+ }
+
+ /* Not enough room in dst, add NUL and traverse rest of src */
+ if(n == 0)
+ {
+ if(siz != 0)
+ *d = '\0'; /* NUL-terminate dst */
+ while (*s++)
+ ;
+ }
+
+ return s - src - 1; /* count does not include NUL */
}
+
#endif
#ifndef HAVE_STRLCAT
-#ifndef HAVE_STRNCAT
-#error neither strncat or strlcat found
-#endif
-
-void strlcat(char* dest, const char* src, size_t count)
+size_t strlcat(char* dst, const char* src, size_t siz)
{
- if(count > 0)
+ char* d = dst;
+ const char* s = src;
+ size_t n = siz;
+ size_t dlen;
+
+ /* Find the end of dst and adjust bytes left but don't go past end */
+ while(n-- != 0 && *d != '\0')
+ d++;
+ dlen = d - dst;
+ n = siz - dlen;
+
+ if(n == 0)
+ return dlen + strlen(s);
+ while(*s != '\0')
+ {
+ if(n != 1)
{
- strncat(dest, src, count);
- dest[count - 1] = 0;
+ *d++ = *s;
+ n--;
}
+
+ s++;
+ }
+
+ *d = '\0';
+
+ return dlen + (s - src); /* count does not include NUL */
}
+
#endif
diff --git a/common/compat.h b/common/compat.h
index 0690bfc..98ebade 100644
--- a/common/compat.h
+++ b/common/compat.h
@@ -77,11 +77,11 @@ char* strupr(char* s);
#endif
#ifndef HAVE_STRLCAT
-void strlcat(char *dst, const char *src, size_t size);
+size_t strlcat(char *dst, const char *src, size_t size);
#endif
#ifndef HAVE_STRLCPY
-void strlcpy(char *dst, const char *src, size_t size);
+size_t strlcpy(char *dst, const char *src, size_t size);
#endif
#endif /* _COMPAT_H_ */
diff --git a/common/smtppass.c b/common/smtppass.c
index 95ceacf..b93b636 100644
--- a/common/smtppass.c
+++ b/common/smtppass.c
@@ -857,7 +857,7 @@ static int avcheck_data(clamsmtp_context_t* ctx, char* logline)
int r, ret = 0;
strlcpy(buf, g_directory, MAXPATHLEN);
- strlcat(buf, "/clamsmtp.XXXXXX", MAXPATHLEN);
+ strlcat(buf, "/clamsmtpd.XXXXXX", MAXPATHLEN);
/* transfer_to_file deletes the temp file on failure */
if((r = transfer_to_file(ctx, buf)) > 0)
diff --git a/configure.in b/configure.in
index 79c997a..41d3905 100644
--- a/configure.in
+++ b/configure.in
@@ -36,8 +36,8 @@ dnl Nate Nielsen <nielsen@memberwebs.com>
dnl
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(clamsmtp, 0.2, nielsen@memberwebs.com)
-AM_INIT_AUTOMAKE(clamsmtp, 0.2)
+AC_INIT(clamsmtp, 0.3, nielsen@memberwebs.com)
+AM_INIT_AUTOMAKE(clamsmtp, 0.3)
LDFLAGS="$LDFLAGS -L/usr/local/lib"
CFLAGS="$CFLAGS -I/usr/local/include"
diff --git a/scripts/clamsmtpd.sh b/scripts/clamsmtpd.sh
new file mode 100644
index 0000000..c574e8b
--- /dev/null
+++ b/scripts/clamsmtpd.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+###########################################################################
+# CONFIGURATION
+
+# The outgoing SMTP server (CHANGE THIS)
+smtp=mysmtp.com:25
+
+# Directory for temporary files (CHANGE THIS)
+tmpdir=/var/tmp
+
+# The user to run as
+user=clamav
+
+# The prefix clamsmtpd was installed to
+prefix=/usr/local/
+
+# The location for pid file
+piddir=/var/run/clamav/
+
+# The clamd socket
+clamsock=/var/run/clamav/clamd
+
+
+###########################################################################
+# SCRIPT
+
+case $1 in
+start)
+ mkdir -p $piddir
+ chown $user $piddir
+ su -m $user -c "$prefix/sbin/clamsmtpd -c $clamsock -D $tmpdir -p $piddir/clamsmtpd.pid $smtp"
+ echo -n "clam-smtpd "
+ ;;
+stop)
+ [ -f $piddir/clamsmtpd.pid ] && kill `cat $piddir/clamsmtpd.pid`
+ echo -n "clam-smtpd "
+ ;;
+*)
+ echo "usage: clamsmptd.sh {start|stop}" >&2
+ ;;
+esac
diff --git a/src/clamsmtpd.c b/src/clamsmtpd.c
index 95ceacf..b93b636 100644
--- a/src/clamsmtpd.c
+++ b/src/clamsmtpd.c
@@ -857,7 +857,7 @@ static int avcheck_data(clamsmtp_context_t* ctx, char* logline)
int r, ret = 0;
strlcpy(buf, g_directory, MAXPATHLEN);
- strlcat(buf, "/clamsmtp.XXXXXX", MAXPATHLEN);
+ strlcat(buf, "/clamsmtpd.XXXXXX", MAXPATHLEN);
/* transfer_to_file deletes the temp file on failure */
if((r = transfer_to_file(ctx, buf)) > 0)
diff --git a/src/compat.c b/src/compat.c
index 54fd760..d3730e0 100644
--- a/src/compat.c
+++ b/src/compat.c
@@ -34,8 +34,37 @@
* CONTRIBUTORS
* Nate Nielsen <nielsen@memberwebs.com>
*
+ *
+ * PORTIONS FROM OPENBSD: -------------------------------------------------
+ *
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+
#include "usuals.h"
#include "compat.h"
@@ -81,34 +110,70 @@ char* strupr(char* s)
#ifndef HAVE_STRLCPY
-#ifndef HAVE_STRNCPY
-#error neither strncpy or strlcpy found
-#endif
-
-void strlcpy(char* dest, const char* src, size_t count)
+size_t strlcpy(char* dst, const char* src, size_t siz)
{
- if(count > 0)
- {
- strncpy(dest, src, count);
- dest[count - 1] = 0;
+ char* d = dst;
+ const char* s = src;
+ size_t n = siz;
+
+ /* Copy as many bytes as will fit */
+ if(n != 0 && --n != 0)
+ {
+ do
+ {
+ if((*d++ = *s++) == 0)
+ break;
}
+ while(--n != 0);
+ }
+
+ /* Not enough room in dst, add NUL and traverse rest of src */
+ if(n == 0)
+ {
+ if(siz != 0)
+ *d = '\0'; /* NUL-terminate dst */
+ while (*s++)
+ ;
+ }
+
+ return s - src - 1; /* count does not include NUL */
}
+
#endif
#ifndef HAVE_STRLCAT
-#ifndef HAVE_STRNCAT
-#error neither strncat or strlcat found
-#endif
-
-void strlcat(char* dest, const char* src, size_t count)
+size_t strlcat(char* dst, const char* src, size_t siz)
{
- if(count > 0)
+ char* d = dst;
+ const char* s = src;
+ size_t n = siz;
+ size_t dlen;
+
+ /* Find the end of dst and adjust bytes left but don't go past end */
+ while(n-- != 0 && *d != '\0')
+ d++;
+ dlen = d - dst;
+ n = siz - dlen;
+
+ if(n == 0)
+ return dlen + strlen(s);
+ while(*s != '\0')
+ {
+ if(n != 1)
{
- strncat(dest, src, count);
- dest[count - 1] = 0;
+ *d++ = *s;
+ n--;
}
+
+ s++;
+ }
+
+ *d = '\0';
+
+ return dlen + (s - src); /* count does not include NUL */
}
+
#endif
diff --git a/src/compat.h b/src/compat.h
index 0690bfc..98ebade 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -77,11 +77,11 @@ char* strupr(char* s);
#endif
#ifndef HAVE_STRLCAT
-void strlcat(char *dst, const char *src, size_t size);
+size_t strlcat(char *dst, const char *src, size_t size);
#endif
#ifndef HAVE_STRLCPY
-void strlcpy(char *dst, const char *src, size_t size);
+size_t strlcpy(char *dst, const char *src, size_t size);
#endif
#endif /* _COMPAT_H_ */