/[spamass-milt]/spamass-milt/spamass-milter.cpp
ViewVC logotype

Log of /spamass-milt/spamass-milter.cpp

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (annotate)
Sticky Tag:

Revision 1.100 - (view) (download) (annotate) - [select for diffs]
Fri Aug 15 02:46:50 2014 UTC (9 years, 3 months ago) by kovert
Branch: MAIN
CVS Tags: HEAD, RELEASE_0_4_0
Changes since 1.99: +5 -3 lines
Diff to previous 1.99
add -a to getopt args; print -C/-R in help output


Revision 1.99 - (view) (download) (annotate) - [select for diffs]
Fri Aug 15 02:25:31 2014 UTC (9 years, 3 months ago) by kovert
Branch: MAIN
Changes since 1.98: +128 -110 lines
Diff to previous 1.98
Add extra-patch-rejecttext1 from FreeBSD, which deals with issues
in bug id #16395 and feature request 103491.


Revision 1.98 - (view) (download) (annotate) - [select for diffs]
Fri Aug 15 02:07:19 2014 UTC (9 years, 3 months ago) by kovert
Branch: MAIN
Changes since 1.97: +18 -3 lines
Diff to previous 1.97
incorporate freebsd's freebsd-patches/extra-patch-addauth (per bug 21046
from schneis)


Revision 1.97 - (view) (download) (annotate) - [select for diffs]
Fri Aug 15 01:51:19 2014 UTC (9 years, 3 months ago) by kovert
Branch: MAIN
Changes since 1.96: +26 -24 lines
Diff to previous 1.96
bump version to 0.3.9.dev

apply gcc warnings patch from bug#29326 (Paul Howarth <pghmcfc>)


Revision 1.96 - (view) (download) (annotate) - [select for diffs]
Thu Aug 14 03:53:11 2014 UTC (9 years, 3 months ago) by kovert
Branch: MAIN
Changes since 1.95: +11 -7 lines
Diff to previous 1.95
add -P option to deal with edge case described i bug #14730


Revision 1.95 - (view) (download) (annotate) - [select for diffs]
Thu Aug 14 03:36:20 2014 UTC (9 years, 3 months ago) by kovert
Branch: MAIN
Changes since 1.94: +104 -44 lines
Diff to previous 1.94
make -i work with ipv6 addresses

patch from http://wilmer.gaa.st/blog/archives/61-spamass-milter-and-IPv6.html

bugid #33111


Revision 1.94 - (view) (download) (annotate) - [select for diffs]
Mon Feb 14 21:50:53 2011 UTC (12 years, 9 months ago) by dnelson
Branch: MAIN
CVS Tags: RELEASE_0_3_2
Changes since 1.93: +0 -25 lines
Diff to previous 1.93
revert 1.93 committed in error


Revision 1.93 - (view) (download) (annotate) - [select for diffs]
Mon Feb 14 21:46:13 2011 UTC (12 years, 9 months ago) by dnelson
Branch: MAIN
Changes since 1.92: +27 -2 lines
Diff to previous 1.92
savannah disabled ftp uploads, at some point, so try rsync again


Revision 1.92 - (view) (download) (annotate) - [select for diffs]
Fri Feb 11 06:01:13 2011 UTC (12 years, 9 months ago) by dnelson
Branch: MAIN
Changes since 1.91: +92 -82 lines
Diff to previous 1.91
Replace all instances of popen() with a custom function that takes an argv
instead of a single string, to avoid a security hole when untrusted user
input is used as part of the command.


Revision 1.91 - (view) (download) (annotate) - [select for diffs]
Mon Jul 24 19:59:17 2006 UTC (17 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.90: +4 -4 lines
Diff to previous 1.90
Add missing ")" after envelope-from and add missing ";" before date in
generated Received: header.

http://savannah.nongnu.org/bugs/?func=detailitem&item_id=17178


Revision 1.90 - (view) (download) (annotate) - [select for diffs]
Thu Mar 23 21:41:36 2006 UTC (17 years, 8 months ago) by dnelson
Branch: MAIN
CVS Tags: RELEASE_0_3_1
Changes since 1.89: +12 -5 lines
Diff to previous 1.89
Spamassassin 3.1.1 now emits headers with CRLF if the incoming message
has CRLFs.  Make sure that we strip the CR from wrapped headers when we
parse the returned message.


Revision 1.89 - (view) (download) (annotate) - [select for diffs]
Thu Jun 2 18:30:25 2005 UTC (18 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.88: +3 -6 lines
Diff to previous 1.88
It turns out that mlfi_close /can/ be called without mlfi_connect, and
there is no guarantee that the context has been set.  If it's NULL,
just return.


Revision 1.88 - (view) (download) (annotate) - [select for diffs]
Thu Apr 7 02:04:24 2005 UTC (18 years, 7 months ago) by dnelson
Branch: MAIN
Changes since 1.87: +93 -19 lines
Diff to previous 1.87
- Make our fake sendmail Received: header even better.

- Fix a silly bug in cmp_nocase_partial that made it return true if
  either string was a prefix of the other (it should return true only
  if s is a prefix of s2).

Thanks to Yoshitaka Tokugawa.


Revision 1.87 - (view) (download) (annotate) - [select for diffs]
Tue Feb 22 16:10:04 2005 UTC (18 years, 9 months ago) by dnelson
Branch: MAIN
Changes since 1.86: +3 -3 lines
Diff to previous 1.86
Change 172.16 to 172.16.0.0 in the usage text.  Partial IP addresses do
not parse correctly.


Revision 1.86 - (view) (download) (annotate) - [select for diffs]
Sat Feb 5 07:03:22 2005 UTC (18 years, 9 months ago) by dnelson
Branch: MAIN
CVS Tags: RELEASE_0_3_0
Changes since 1.85: +6 -2 lines
Diff to previous 1.85
Fix some unused-variable warnings when not on FreeBSD.  The hack will
go away in the next release, since the bug has been fixed.


Revision 1.85 - (view) (download) (annotate) - [select for diffs]
Fri Sep 24 04:42:16 2004 UTC (19 years, 2 months ago) by dnelson
Branch: MAIN
Changes since 1.84: +6 -2 lines
Diff to previous 1.84
When reading headers from spamc's output, strip a trailing CR from the
line. if it exists.


Revision 1.84 - (view) (download) (annotate) - [select for diffs]
Tue Sep 21 21:04:51 2004 UTC (19 years, 2 months ago) by dnelson
Branch: MAIN
Changes since 1.83: +3 -3 lines
Diff to previous 1.83
Make sure variables are set in the constructor in the same order they
appear in the header.


Revision 1.83 - (view) (download) (annotate) - [select for diffs]
Tue Sep 21 20:49:18 2004 UTC (19 years, 2 months ago) by dnelson
Branch: MAIN
Changes since 1.82: +12 -8 lines
Diff to previous 1.82
If a fork fails at the right time, "running" may be set when pid=-1.
This can be very bad when the cleanup routine runs kill(pid, SIGKILL).


Revision 1.82 - (view) (download) (annotate) - [select for diffs]
Thu Aug 26 18:01:35 2004 UTC (19 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.81: +9 -3 lines
Diff to previous 1.81
When extracting the score, check for "score=###" as well as "hits=###"


Revision 1.81 - (view) (download) (annotate) - [select for diffs]
Thu Jul 29 02:15:09 2004 UTC (19 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.80: +4 -4 lines
Diff to previous 1.80
I have no idea how gcc allowed this to compile.


Revision 1.80 - (view) (download) (annotate) - [select for diffs]
Fri Jul 16 21:46:00 2004 UTC (19 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.79: +8 -8 lines
Diff to previous 1.79
In local_user, stop at the first "+" or "@", so we can handle
user+detail addresses correctly.  Something similar should be done for
full_user but that's a bit more complicated.


Revision 1.79 - (view) (download) (annotate) - [select for diffs]
Fri Jun 4 02:50:47 2004 UTC (19 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.78: +15 -5 lines
Diff to previous 1.78
Don't segfault if we can't fetch the _ and j macros.


Revision 1.78 - (view) (download) (annotate) - [select for diffs]
Wed May 19 15:00:48 2004 UTC (19 years, 6 months ago) by dnelson
Branch: MAIN
Changes since 1.77: +51 -42 lines
Diff to previous 1.77
Misc C++ cleanups courtesy Jeremy Lin, plus a fix for Linux's ps
showing blanks in the arguments to -i and -d.


Revision 1.77 - (view) (download) (annotate) - [select for diffs]
Thu May 13 21:43:53 2004 UTC (19 years, 6 months ago) by dnelson
Branch: MAIN
Changes since 1.76: +14 -10 lines
Diff to previous 1.76
Adjust output of generated Received: header to more closely match
sendmail's output.  Spamassassin is very picky about parsing it.  Fixes
savannah bug 6970 and patch 3051.

Also convert all "RCPT TO" commands to X-Envelope-To: headers, not just
the first one.  This may have prevented whitelist checks from applying
to all recipients.


Revision 1.76 - (view) (download) (annotate) - [select for diffs]
Mon May 10 18:59:32 2004 UTC (19 years, 6 months ago) by dnelson
Branch: MAIN
Changes since 1.75: +2 -13 lines
Diff to previous 1.75
Don't use asprintf to expand aliases, since we also use 'buf' to read
the results of the popen.  Just set a 1024-char buffer, and anyone with
an email address longer than that loses.


Revision 1.75 - (view) (download) (annotate) - [select for diffs]
Thu Mar 18 18:37:08 2004 UTC (19 years, 8 months ago) by dnelson
Branch: MAIN
Changes since 1.74: +99 -14 lines
Diff to previous 1.74
Document -p and -x

Add the ability to send spam to a spambucket even if -r is set


Revision 1.74 - (view) (download) (annotate) - [select for diffs]
Sun Feb 22 04:18:00 2004 UTC (19 years, 9 months ago) by dnelson
Branch: MAIN
Changes since 1.73: +2 -2 lines
Diff to previous 1.73
arg. why does cvs default to commit on a blank log.

Put email alias expansion under a flag (-x, defaulted to off).


Revision 1.73 - (view) (download) (annotate) - [select for diffs]
Sun Feb 22 04:16:27 2004 UTC (19 years, 9 months ago) by dnelson
Branch: MAIN
Changes since 1.72: +64 -52 lines
Diff to previous 1.72
*** empty log message ***


Revision 1.72 - (view) (download) (annotate) - [select for diffs]
Tue Jan 27 19:39:43 2004 UTC (19 years, 10 months ago) by dnelson
Branch: MAIN
Changes since 1.71: +16 -7 lines
Diff to previous 1.71
-e now requires the default domain as a parameter.  Also fix up
whitespace and punctuation in the manpage.


Revision 1.71 - (view) (download) (annotate) - [select for diffs]
Fri Oct 24 06:55:14 2003 UTC (20 years, 1 month ago) by dnelson
Branch: MAIN
Changes since 1.70: +6 -2 lines
Diff to previous 1.70
Use gcc's verbose exception handler is possible.  If this function is
unavailable, C++ will simply abort on any exception.  Ugh.


Revision 1.70 - (view) (download) (annotate) - [select for diffs]
Tue Oct 21 21:40:32 2003 UTC (20 years, 1 month ago) by dnelson
Branch: MAIN
Changes since 1.69: +46 -25 lines
Diff to previous 1.69
make -f fully daemonize, and add -P to create a pidfile.


Revision 1.69 - (view) (download) (annotate) - [select for diffs]
Fri Sep 12 05:45:05 2003 UTC (20 years, 2 months ago) by dnelson
Branch: MAIN
Changes since 1.68: +3 -3 lines
Diff to previous 1.68
remove $Revision:$


Revision 1.68 - (view) (download) (annotate) - [select for diffs]
Fri Sep 12 05:42:07 2003 UTC (20 years, 2 months ago) by dnelson
Branch: MAIN
Changes since 1.67: +28 -3 lines
Diff to previous 1.67
FreeBSD's libc_r userland threads has a race condition in popen, but I
don't know where.  Wrap it in a mutex just to be safe.


Revision 1.67 - (view) (download) (annotate) - [select for diffs]
Wed Sep 3 04:53:16 2003 UTC (20 years, 2 months ago) by dnelson
Branch: MAIN
Changes since 1.66: +3 -3 lines
Diff to previous 1.66
Oops.  Forgot to strip the domain part in local_user when there are no brackets.


Revision 1.66 - (view) (download) (annotate) - [select for diffs]
Fri Aug 29 16:00:01 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.65: +3 -3 lines
Diff to previous 1.65
Redirect stderr to stdout when running sendmail -bv; otherwise we lose
anything sent to stderr


Revision 1.65 - (view) (download) (annotate) - [select for diffs]
Thu Aug 28 14:59:17 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.64: +66 -19 lines
Diff to previous 1.64
Add -e flag to pass full email address to spamc

Run all recipients through sendmail -bv (this may end up behind a
commandline switch, but it's low-overhead so probably not).


Revision 1.64 - (view) (download) (annotate) - [select for diffs]
Wed Aug 13 03:47:56 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.63: +18 -19 lines
Diff to previous 1.63
- add printf style checking to debug() on systems that support it
- search for sendmail instead of relying on paths.h which may not exist


Revision 1.63 - (view) (download) (annotate) - [select for diffs]
Mon Aug 11 22:12:19 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.62: +4 -4 lines
Diff to previous 1.62
move newrecipients out of the inner loop


Revision 1.62 - (view) (download) (annotate) - [select for diffs]
Mon Aug 11 21:36:32 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.61: +38 -9 lines
Diff to previous 1.61
Preliminary work to support alias/virtusertable expansion.
sendmail -bv is called and its output is parsed, but all we do is log it
so far.


Revision 1.61 - (view) (download) (annotate) - [select for diffs]
Wed Aug 6 04:45:46 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.60: +11 -4 lines
Diff to previous 1.60
Fix two cases where we caught an error but didn't clean up the assassin
object.


Revision 1.60 - (view) (download) (annotate) - [select for diffs]
Wed Aug 6 04:29:48 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.59: +14 -4 lines
Diff to previous 1.59
- Correctly exit if we can't exec spamc
- Check our polled fds for errors - prevents us from spinning if
  something happens to spamc


Revision 1.59 - (view) (download) (annotate) - [select for diffs]
Thu Jul 31 22:35:32 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.58: +24 -27 lines
Diff to previous 1.58
We still need to call update_or_insert for headers if -M is set, so we
can cache the header value.  Just don't call the milter update
functions.


Revision 1.58 - (view) (download) (annotate) - [select for diffs]
Thu Jul 31 19:13:02 2003 UTC (20 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.57: +28 -14 lines
Diff to previous 1.57
New -M flag that disables all body/header changes.  With this flag, the
milter is transparent to the message stream.


Revision 1.57 - (view) (download) (annotate) - [select for diffs]
Tue Jul 22 01:10:06 2003 UTC (20 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.56: +3 -2 lines
Diff to previous 1.56
POSIX says strcasecmp requires strings.h


Revision 1.56 - (view) (download) (annotate) - [select for diffs]
Thu Jul 17 02:28:35 2003 UTC (20 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.55: +5 -2 lines
Diff to previous 1.55
If there is no body, set bob to point to the end of the string returned
by spamassassin instead of string::npos.


Revision 1.55 - (view) (download) (annotate) - [select for diffs]
Mon Jul 7 19:46:51 2003 UTC (20 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.54: +9 -5 lines
Diff to previous 1.54
Added func logging for two returns in ::output and ::input


Revision 1.54 - (view) (download) (annotate) - [select for diffs]
Mon Jul 7 19:44:08 2003 UTC (20 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.53: +7 -2 lines
Diff to previous 1.53
Add func debug logging for mlfi_envrcpt


Revision 1.53 - (view) (download) (annotate) - [select for diffs]
Mon Jul 7 19:39:59 2003 UTC (20 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.52: +5 -2 lines
Diff to previous 1.52
shortcut ip_in_networklist if the list is empty.


Revision 1.52 - (view) (download) (annotate) - [select for diffs]
Thu Jun 26 15:10:44 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
CVS Tags: RELEASE_0_2_0
Changes since 1.51: +3 -3 lines
Diff to previous 1.51
typo


Revision 1.51 - (view) (download) (annotate) - [select for diffs]
Thu Jun 26 14:45:18 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.50: +9 -4 lines
Diff to previous 1.50
NULL hostaddr is actually a common occurance; running sendmail on the
local host does this.  Map NULL to 127.0.0.1 so it's treated just like
a connection to localhost port 25.


Revision 1.50 - (view) (download) (annotate) - [select for diffs]
Wed Jun 25 16:17:34 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.49: +5 -5 lines
Diff to previous 1.49
Document -B, and sort -h output


Revision 1.49 - (view) (download) (annotate) - [select for diffs]
Wed Jun 25 15:15:50 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.48: +12 -5 lines
Diff to previous 1.48
Check for a NULL hostaddr in mlfi_connect.  It should never happen, so
emit a warning in the log when it does.


Revision 1.48 - (view) (download) (annotate) - [select for diffs]
Wed Jun 18 23:13:03 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.47: +10 -2 lines
Diff to previous 1.47
- Use my own dmalloc check, since AM_WITH_DMALLOC only works for
  nonthreaded C programs.

- Some systems provide strsep() but no prototype.  Check for that.


Revision 1.47 - (view) (download) (annotate) - [select for diffs]
Sat Jun 14 19:01:56 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.46: +73 -54 lines
Diff to previous 1.46
Move the launch of spamc from mlfi_envrcpt back to mlfi_header where it
was before rev 1.38.  This should fix reports of "spamd: bad protocol"
errors being logged when we kill spamc without sending any data.


Revision 1.46 - (view) (download) (annotate) - [select for diffs]
Thu Jun 12 22:41:34 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.45: +18 -4 lines
Diff to previous 1.45
Lowercase the username when using -u; email addresses are
case-insensitive, but userids are usually all-lowercase and
case-sensitive.


Revision 1.45 - (view) (download) (annotate) - [select for diffs]
Wed Jun 11 20:17:26 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.44: +73 -27 lines
Diff to previous 1.44
* Even better sendmail-style Received: header generation.  Pass SA the
  value of the HELO command.  This lets rules like FORGED_HOTMAIL work.

* Beginnings of a better debug logline.  Remember the sendmail queue ID.
  Not sure of the best way to pass it to the debug() function though.


Revision 1.44 - (view) (download) (annotate) - [select for diffs]
Tue Jun 10 04:57:40 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.43: +11 -2 lines
Diff to previous 1.43
provide a strsep() for systems without one


Revision 1.43 - (view) (download) (annotate) - [select for diffs]
Tue Jun 10 04:47:22 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.42: +3 -3 lines
Diff to previous 1.42
printf->fprintf


Revision 1.42 - (view) (download) (annotate) - [select for diffs]
Tue Jun 10 03:03:17 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.41: +20 -6 lines
Diff to previous 1.41
New flag -B.  Just like -b, but the original recipient gets the spam too.


Revision 1.41 - (view) (download) (annotate) - [select for diffs]
Mon Jun 9 17:19:25 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.40: +62 -10 lines
Diff to previous 1.40
Add spambucket support.  "-b otheraddress" will redirect all tagged
spam to that address.  Original recipients get put into X-Spam-Orig-To:
headers.


Revision 1.40 - (view) (download) (annotate) - [select for diffs]
Sat Jun 7 19:16:39 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.39: +28 -30 lines
Diff to previous 1.39
Instead of playing musical chairs with our private context pointer,
create a single structure that holds both the remote IP address and the
pointer to our assassin object.


Revision 1.39 - (view) (download) (annotate) - [select for diffs]
Fri Jun 6 20:48:27 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.38: +13 -9 lines
Diff to previous 1.38
Generate a better dummy Received: header.  If the admin has added the
"b" macro (rfc822 date) to the milter's list of visible macros, pass
that to spamc.  This allows SA to do Date: header validation if there
are no other Received: headers in the message.

Also update README to include the sendmail.mc line required to enable "b".


Revision 1.38 - (view) (download) (annotate) - [select for diffs]
Fri Jun 6 16:37:24 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.37: +111 -21 lines
Diff to previous 1.37
Remember the envelope sender and recipient, remember the connecting IP,
and insert appropriate headers at the top of the message we send to
spamc, so that Spamassassin can use them.

The envelope info gets put into X-Envelope-From: and X-Envelope-To: ,
which SA will use when checking the whitelist_to and _from rules.

The connecting IP gets put into a dummy "Received: [111.222.333.444]"
header.  Without it, none of the DNSBL or whitelist checks will see
this IP.  The dummy header does not seem to trigger any "forged
Received:" rules, so that's good.

Note that remembering the connecting IP address means we need to carry
information between the lifetimes of SpamAssassin objects, so we have
to use the milter private data pointer.  This means that within a
message, the pointer points to a SpamAssassin object.  Outside of a
message but during a client connection, the pointer points to a struct
connect_info.  This means some extra work in the message error path to
recover the connect_info pointer.  It also means that for symmetry, we
have to create the SpamAssassin object at the beginning on a "message"
session - i.e. within mlfi_envrcpt instead of mlfi_header.

Also for ease of coding add some more output methods with string and
unsized void* arguments.


Revision 1.37 - (view) (download) (annotate) - [select for diffs]
Fri Jun 6 16:22:05 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.36: +71 -3 lines
Diff to previous 1.36
Commit Waider's updated retrieve_field function that I forgot about.
This fixes a bug where the milter fails to retrieve the SA score from a
message with absolutely no headers.   The old code could not retrieve the
first header in a message, and if there are no headers in the original
message, the X-Spam-Status header ends up being the first.


Revision 1.36 - (view) (download) (annotate) - [select for diffs]
Fri Jun 6 16:16:03 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.35: +3 -3 lines
Diff to previous 1.35
RFC822 says the blank line between header and body is \r\n.
Spamassassin doesn't seem to care but it's wrong anyway :)


Revision 1.35 - (view) (download) (annotate) - [select for diffs]
Fri Jun 6 16:10:29 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.34: +9 -8 lines
Diff to previous 1.34
Clean up some debugging messages


Revision 1.34 - (view) (download) (annotate) - [select for diffs]
Fri Jun 6 16:05:08 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.33: +126 -66 lines
Diff to previous 1.33
Convert the debug levels into flags, so it's easier to enable debugging
for a single subsystem.  The old numbers are still supported.


Revision 1.33 - (view) (download) (annotate) - [select for diffs]
Fri Jun 6 15:43:06 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.32: +39 -39 lines
Diff to previous 1.32
Cleanup commit.  You don't need a semicolon after a function body, and
Intel's compiler warns about them.


Revision 1.32 - (view) (download) (annotate) - [select for diffs]
Thu Jun 5 21:18:01 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.31: +3 -3 lines
Diff to previous 1.31
reword -i description so it says skip checks instead of skip the
mail itself


Revision 1.31 - (view) (download) (annotate) - [select for diffs]
Wed Jun 4 19:41:06 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.30: +3 -3 lines
Diff to previous 1.30
I thought I cut'n'pasted this right, but I didn't.  Allocate the
right number of bytes for the internalnets array when resizing.


Revision 1.30 - (view) (download) (annotate) - [select for diffs]
Tue Jun 3 06:36:15 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.29: +3 -3 lines
Diff to previous 1.29
gcc 2.95 apparently can't handle the case where a struct and an element
have the same name.


Revision 1.29 - (view) (download) (annotate) - [select for diffs]
Tue Jun 3 06:24:54 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.28: +130 -20 lines
Diff to previous 1.28
Add -i to list netblocks to ignore (argument is a comma-delimited list
of ip addresses, ip/netmask, or ip/bits).

Remember arguments after --, and pass them to spamc.  This makes the -D
flag redundant, and lets you change the port number, enable SSL mode,
etc.


Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Tue Jun 3 02:08:42 2003 UTC (20 years, 5 months ago) by dnelson
Branch: MAIN
Changes since 1.27: +4 -3 lines
Diff to previous 1.27
If the server cannot process mdoc macros, use mdoc2man to generate a
manpage with man macros instead.


Revision 1.27 - (view) (download) (annotate) - [select for diffs]
Fri Mar 7 04:33:24 2003 UTC (20 years, 8 months ago) by dnelson
Branch: MAIN
Changes since 1.26: +4 -4 lines
Diff to previous 1.26
Use 'defaultuser' instead of 'user' as an example when talking about
the argument to the -u flag.


Revision 1.26 - (view) (download) (annotate) - [select for diffs]
Thu Mar 6 21:37:18 2003 UTC (20 years, 8 months ago) by dnelson
Branch: MAIN
Changes since 1.25: +6 -2 lines
Diff to previous 1.25
Provide a substitute poll() function for systems that are missing it.


Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Thu Mar 6 21:33:47 2003 UTC (20 years, 8 months ago) by dnelson
Branch: MAIN
Changes since 1.24: +14 -4 lines
Diff to previous 1.24
. Add the ability to connect to a spamd on another server (-D host)

. Change the redhat rc script's path to match where an RPM would put
  spamass-milter


Revision 1.24 - (view) (download) (annotate) - [select for diffs]
Tue Jan 21 20:44:28 2003 UTC (20 years, 10 months ago) by dnelson
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23
(forced commit due to empty log message)

Fix "-u" to actually pass its argument to spamc instead of hardcoding
"_multi_".


Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Tue Jan 21 20:42:34 2003 UTC (20 years, 10 months ago) by dnelson
Branch: MAIN
Changes since 1.22: +6 -6 lines
Diff to previous 1.22
*** empty log message ***


Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Tue Dec 31 20:03:13 2002 UTC (20 years, 10 months ago) by dnelson
Branch: MAIN
CVS Tags: RELEASE_0_1_3a
Changes since 1.21: +15 -2 lines
Diff to previous 1.21
Add a call to fork spamc after header processing, as a fallback case
for when no headers are sent at all.


Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Tue Dec 31 19:34:48 2002 UTC (20 years, 10 months ago) by dnelson
Branch: MAIN
Changes since 1.20: +4 -4 lines
Diff to previous 1.20
add a big more debugging to the poll loop


Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Mon Dec 23 17:08:30 2002 UTC (20 years, 11 months ago) by dnelson
Branch: MAIN
CVS Tags: RELEASE_0_1_3
Changes since 1.19: +163 -46 lines
Diff to previous 1.19
Add -u option to pass the username to spamc.  Without -u behaviour
should be unchanged.


Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Sat Dec 21 18:20:16 2002 UTC (20 years, 11 months ago) by dnelson
Branch: MAIN
Changes since 1.18: +9 -3 lines
Diff to previous 1.18
Check for an empty header


Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Sun Nov 17 22:57:23 2002 UTC (21 years ago) by dnelson
Branch: MAIN
Changes since 1.17: +55 -20 lines
Diff to previous 1.17
Add -r flag, which allows you to have sendmail reject the message if SA
tags it as spam, or if it exceeds a given score.

Closes patches 440 and 441, submitted by Patrick Monnerat <pm@datasphere.ch>


Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Fri Nov 15 23:22:32 2002 UTC (21 years ago) by dnelson
Branch: MAIN
Changes since 1.16: +10 -5 lines
Diff to previous 1.16
Add -m option, which disables body, Subject:, and Content-Type: header
modification.  Closes patch 385.


Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Fri Nov 15 07:04:16 2002 UTC (21 years ago) by dnelson
Branch: MAIN
Changes since 1.15: +79 -143 lines
Diff to previous 1.15
- Factor out all the header-changing code into a single
  update_or_insert function.  This greatly simplifies the whole
  program, finally making it insert/change/leave correctly for all the
  headers it touches.

- Fix mlfi_header to actually suppress incoming SA headers like it's
  supposed to.  This fixes a bug where an incoming SA header with the
  wrong case would end up overriding the header our SA tries to add.

- Declare a temporary string variable to hold the body text before we
  call smfi_replacebody.  Trying to do stringvar.substr(x,x).c_str()
  simply will not work.  substr() creates a temporary string object,
  c_str() dutifully returns a pointer to it, and when the destructor
  for the temp string frees the memory, the data the pointer points to
  gets blown away.  This fixes a longstanding bug where tagged emails
  would have their message body completely overwritten with x00 or xD0
  on OSes that ensure that free'd memory is blanked.

- C++ should be strangled, then shot, then burned, and the ashes set
  into a cement block and dumped into the ocean.  This should be
  obvious.


Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Wed Aug 28 16:54:03 2002 UTC (21 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.14: +3 -1 lines
Diff to previous 1.14
Add Id variable to store CVS version in the binary


Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Fri Aug 23 16:59:38 2002 UTC (21 years, 3 months ago) by dnelson
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13
Fix bug that caused doubling of Content-Type: on spam emails.


Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Wed Aug 14 16:15:10 2002 UTC (21 years, 3 months ago) by dnelson
Branch: MAIN
CVS Tags: RELEASE_0_1_2
Changes since 1.12: +5 -5 lines
Diff to previous 1.12
Fix swapped variables names preventing subject and content-type from
being updated (from Lance A. Brown)


Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Tue Jul 23 03:48:09 2002 UTC (21 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.11: +1 -1 lines
Diff to previous 1.11
Forgot to mention; the previous commit was patch 354


Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Tue Jul 23 03:47:28 2002 UTC (21 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.10: +23 -14 lines
Diff to previous 1.10
Only replace Subject: and Content-Type: headers if they change


Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Tue Jul 23 03:34:00 2002 UTC (21 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9
Patch 341

- Fix typo affecting the case of incoming spam with no subject


Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Tue Jul 23 02:02:12 2002 UTC (21 years, 4 months ago) by dnelson
Branch: MAIN
Changes since 1.8: +233 -84 lines
Diff to previous 1.8
- Update to autoconf 2.53
- Use ACX_PTHREAD for more portable threads detection
- Only -lmilter is required; search for -lsm or -lsmutil when -lmilter fails,
  for compatibility with older sendmails
- Only mfapi.h is required
- add net library checks for Solaris
- Reorder entries in autogen.sh
- Move struct declarations into headers, and variable definitions into
  source.
- add -d debug flag
- fix incorrect use of LOG_ macros
- use poll when feeding data to spamc to avoid the 250k deadlock
- compiles with gcc 3.1


Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Sat Apr 27 17:05:32 2002 UTC (21 years, 7 months ago) by greve
Branch: MAIN
Changes since 1.7: +35 -2 lines
Diff to previous 1.7
Added support for 'X-Spam-Level' Flag introduced with version 2.20 of SpamAssassin


Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Wed Mar 27 15:56:17 2002 UTC (21 years, 8 months ago) by supermathie
Branch: MAIN
Changes since 1.6: +66 -24 lines
Diff to previous 1.6
Added a -f option that makes spamass-milter fork into the background
spamass-milt now removes the socket if it already exists.


Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Wed Mar 6 13:07:07 2002 UTC (21 years, 8 months ago) by greve
Branch: MAIN
Changes since 1.5: +13 -11 lines
Diff to previous 1.5
Applied some patches. Rights assigned to FSF Europe. Appointed Michael as maintainer.


Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Thu Jan 31 15:34:43 2002 UTC (21 years, 9 months ago) by greve
Branch: MAIN
CVS Tags: r011, release_0_1_1
Changes since 1.4: +3 -3 lines
Diff to previous 1.4
fixed some typing bugs... :-)


Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Thu Jan 31 15:28:34 2002 UTC (21 years, 9 months ago) by greve
Branch: MAIN
Changes since 1.3: +40 -17 lines
Diff to previous 1.3
* Update for Version 2.0+ of SpamAssassin
* Only modify mail *not* rated Spam before, leave marked Spam untouched


Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Wed Jan 16 22:24:52 2002 UTC (21 years, 10 months ago) by greve
Branch: MAIN
Changes since 1.2: +2 -1 lines
Diff to previous 1.2
output package name & version with usage


Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Wed Jan 16 22:19:47 2002 UTC (21 years, 10 months ago) by greve
Branch: MAIN
Changes since 1.1: +7 -5 lines
Diff to previous 1.1
now using SPAMC variable determined in configure


Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Wed Jan 16 09:41:13 2002 UTC (21 years, 10 months ago) by greve
Branch: MAIN
Source Base


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Sort log by:

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26