Update of /cvsroot/mahogany/M/lib/dspam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25526
Modified Files:
dspam.c libdspam.c util.c
Log Message:
resolved conflicts after 3.1.0 beta 1 merge
Index: dspam.c
===================================================================
RCS file: /cvsroot/mahogany/M/lib/dspam/dspam.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- dspam.c 10 Jul 2004 16:26:02 -0000 1.4
+++ dspam.c 12 Jul 2004 14:13:11 -0000 1.5
@@ -35,5 +35,8 @@
#include <signal.h>
#include <sys/stat.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <io.h>
+#include <process.h>
+#else
#include <sys/wait.h>
#include <sys/param.h>
@@ -97,5 +100,7 @@
#endif
+#ifndef _WIN32
struct passwd *p;
+#endif
int retcode, exitcode = EXIT_SUCCESS;
@@ -1277,5 +1282,5 @@
if (value > 0)
{
- memcpy (SIG.data +
+ memcpy ((char *)SIG.data +
(i *
sizeof (unsigned long
@@ -1942,5 +1947,5 @@
{
memcpy (&token,
- CTX->signature->data +
+ (char *)CTX->signature->data +
(i *
sizeof (unsigned long long)), sizeof (unsigned long long));
Index: libdspam.c
===================================================================
RCS file: /cvsroot/mahogany/M/lib/dspam/libdspam.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- libdspam.c 10 Jul 2004 16:26:02 -0000 1.8
+++ libdspam.c 12 Jul 2004 14:13:11 -0000 1.9
@@ -236,5 +236,7 @@
spam_result = _ds_operate (CTX, header->data, body->data);
- if (spam_result == DSR_ISSPAM || spam_result == DSR_ISINNOCENT)
+ if (spam_result == DSR_ISSPAM ||
+ spam_result == DSR_ISINNOCENT ||
+ spam_result == DSR_ISWHITELISTED)
{
if (CTX->classification == DSR_ISINNOCENT)
@@ -252,10 +254,11 @@
CTX->operating_mode = DSM_PROCESS;
- if (CTX->result == DSR_ISSPAM || CTX->result == DSR_ISINNOCENT)
+ if (CTX->result == DSR_ISSPAM ||
+ CTX->result == DSR_ISINNOCENT ||
+ CTX->result == DSR_ISWHITELISTED)
return 0;
else
{
- LOGDEBUG ("received invalid result (! DSR_ISSPAM || DSR_INNOCENT): %d",
- CTX->result);
+ LOGDEBUG ("received invalid result (! DSR_ISSPAM || DSR_INNOCENT ||
DSR_ISWHITELISTED): %d", CTX->result);
return EUNKNOWN;
}
@@ -349,6 +352,7 @@
char *body pointer to message body
- returns: DSR_ISSPAM message is spam*
- DSR_ISINNOCENT message is innocent*
+ returns: DSR_ISSPAM message is spam *
+ DSR_ISINNOCENT message is innocent *
+ DSR_ISWHITELISTED message is whitelisted *
* returns result of actual calculation regardless of mode
Index: util.c
===================================================================
RCS file: /cvsroot/mahogany/M/lib/dspam/util.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- util.c 10 Jul 2004 16:37:31 -0000 1.6
+++ util.c 12 Jul 2004 14:13:11 -0000 1.7
@@ -367,5 +367,5 @@
#endif
{
- if (dir != NULL && stat (path, &s))
+ if (dir != NULL && stat (path, &s) && path[0] != 0)
{
int x;
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
