head	1.13;
access;
symbols
	RELEASE_4_6_2:1.12
	RELEASE_4_6_1:1.12
	RELEASE_4_6_0:1.12
	RELEASE_5_0_DP1:1.11
	RELEASE_4_4_0:1.3;
locks; strict;
comment	@# @;


1.13
date	2002.08.25.05.30.34;	author ache;	state dead;
branches;
next	1.12;

1.12
date	2002.05.11.03.26.45;	author ache;	state Exp;
branches;
next	1.11;

1.11
date	2002.02.11.22.42.02;	author ache;	state Exp;
branches;
next	1.10;

1.10
date	2001.11.07.16.02.27;	author ache;	state dead;
branches;
next	1.9;

1.9
date	2001.10.22.13.57.27;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	2001.10.20.20.50.21;	author ache;	state dead;
branches;
next	1.7;

1.7
date	2001.10.03.19.11.53;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	2001.10.03.08.08.07;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	2001.10.03.04.56.34;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	2001.09.16.11.40.19;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	2001.08.31.03.59.46;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	2001.08.29.20.30.48;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	2001.08.25.11.29.33;	author ache;	state Exp;
branches;
next	;


desc
@@


1.13
log
@Upgrade to 4.28.10
@
text
@--- src/Makefile.nix.orig	Mon Mar 18 20:43:19 2002
+++ src/Makefile.nix	Fri May 10 11:53:25 2002
@@@@ -18,7 +18,6 @@@@
 CC_AIX          = cc_r
 CC_Solaris_GNU  = gcc
 CC_Solaris_SUN  = cc
-CC              = $(CC_$(OS)$(ENV))
 
 # OS-specific compilation flags
 ADDF_AIX        = -qmaxmem=16384 -DNO_VSYSLOG -DNO_SNPRINTF -DNOT_GCC_DW -I../addons/aix/include
@@@@ -31,7 +30,7 @@@@
 # Common flags
 OPTFLAGS        = ___OPT_FLAGS___
 DEFFLAGS        = -D__UNIX_DW -D$(OS)_DW 
-INCFLAGS        = -I./include -I./src
+INCFLAGS        = -I./src
 ADD_CFLAGS      = $(OPTFLAGS) $(DEFFLAGS) $(INCFLAGS) $(ADDFLAGS)
 
 SRCS	= \
@


1.12
log
@Upgrade to 4.28
@
text
@@


1.11
log
@Add -D_THREAD_SAFE, remove libsmutil building
@
text
@d1 7
a7 3
--- src/Makefile.bsd.orig	Tue Oct 16 19:03:59 2001
+++ src/Makefile.bsd	Tue Feb 12 01:07:07 2002
@@@@ -63,7 +63,7 @@@@
d9 9
a17 4
 .c.o: 
 	$(CC) -c $(ADD_CFLAGS) -D__SIGNAL_BASED_DW $<
-	$(CC) -c $(ADD_CFLAGS) -D__THREAD_BASED_DW $< -o ${.PREFIX}_r.o
+	$(CC) -c $(ADD_CFLAGS) -D__THREAD_BASED_DW -D_THREAD_SAFE $< -o ${.PREFIX}_r.o
d19 1
a19 2
 clean:
 	rm -f *.bak *~ *.err *.o ../lib/libdwclient*.a ../include/*.h
@


1.10
log
@Upgrade to 4.26c
@
text
@d1 11
a11 11
--- dw_filter.c.bak	Mon Oct 15 15:04:09 2001
+++ dw_filter.c	Mon Oct 22 17:47:55 2001
@@@@ -972,7 +972,7 @@@@
             if( snprintf( ArchiveMsg, sizeof(ArchiveMsg),
                             "Original message was stored in the archive.\r\n"
                             "To receive original message please contact postmaster:\r\n%s\r\n\r\n"
-                            "Archive record: %s\r\n", name + ArcNameOffs, NotifierMail ) < 0 )
+			    "Archive record: %s\r\n", NotifierMail, name + ArcNameOffs ) < 0 )
             {
                 wprintLib( "can not create archive message, skipped" );
                 ArchiveMsg[0] = NULLCHAR;
@


1.9
log
@Fix argument order in mail reply message
@
text
@@


1.8
log
@Upgrade to 4.26b
@
text
@d1 4
a4 37
--- dw_filter.c.orig	Thu Sep 27 01:00:46 2001
+++ dw_filter.c	Wed Oct  3 23:05:43 2001
@@@@ -606,7 +606,7 @@@@
         }
         else
         {
-            wprintLib( "block proccessing from <>" );
+	    wprintLib( "block processing from <>" );
             free_private_data( priv );
             if( set_private_data( context, NULL ) != MI_SUCCESS )
             {
@@@@ -621,7 +621,7 @@@@
         wprintLib( "%s(%d) - no memory for private data", __FILE__, __LINE__ );
         FAIL_EXIT( context, priv );
     }
-    wprintLib( "start proccessing from %s", priv->from );
+    wprintLib( "start processing from %s", priv->from );
     priv->fname_tmp = strdup( ShareTemplate );
     if( !priv->fname_tmp )
     {
@@@@ -906,7 +906,8 @@@@
         if( plog )
         {
             len = snprintf( NotifyMsg, sizeof(NotifyMsg),
-                            "Message sent from %s infected by virus and has not been delivered.\r\n"
+			    "Message sent from %s\r\n"
+			    "infected by virus and has not been delivered.\r\n"
                             "Diagnostic:\r\n%s\r\n"
                             "Original message was stored in the archive.\r\n"
                             "Archive record: %s\r\n"
@@@@ -917,7 +918,8 @@@@
         else
         {
             len = snprintf( NotifyMsg, sizeof(NotifyMsg),
-                            "Message sent from %s infected by virus and has not been delivered.\r\n"
+			    "Message sent from %s\r\n"
+			    "infected by virus and has not been delivered.\r\n"
a5 1
                             "Archive record: %s\r\n"
d7 5
a11 9
@@@@ -983,7 +985,7 @@@@
     }
     else
     {
-        wprintLib( "message sent by %s is okey.\n", priv->from );
+	wprintLib( "message sent by %s is okay.\n", priv->from );
         exit_code = SMFIS_ACCEPT;
     }
     if( bLocal && (virus == 0) && (exit_code == SMFIS_ACCEPT) && (status & DERR_EVAL_KEY) && (priv->body_offset > 0) )
@


1.7
log
@Wrap long line in virus detection mail message
@
text
@@


1.6
log
@Move drweb-dependent configuration into pre-install section
Fix one spelling mistake in diagnostic
@
text
@d2 1
a2 1
+++ dw_filter.c	Wed Oct  3 11:56:41 2001
d21 21
a41 1
@@@@ -983,7 +983,7 @@@@
@


1.5
log
@Upgrade to 4.26
(working, but not cleanly configured)
@
text
@d2 1
a2 1
+++ dw_filter.c	Wed Oct  3 06:25:53 2001
d21 9
@


1.4
log
@Fix more spellings
@
text
@d1 3
a3 14
--- dw_filter.c.orig	Mon Jul 30 05:12:02 2001
+++ dw_filter.c	Sun Sep 16 15:32:15 2001
@@@@ -239,7 +239,7 @@@@
     {   
         priv->from = strdup( "<>" );       
     }
-    syslog( LOG_MAIL | LOG_INFO, "Start proccessing from %s", priv->from );
+    syslog( LOG_MAIL | LOG_INFO, "Start processing from %s", priv->from );
     priv->fname_tmp = strdup( ShareTemplate );
     if( !priv->fname_tmp )
     {
@@@@ -549,7 +549,7 @@@@
             syslog( LOG_MAIL | LOG_DEBUG, "can not replace message" );
             FAIL_EXIT( context, priv );
d5 1
a5 2
-        if( bSenderNotify && priv->from && (strlen(priv->from) > 0) )
+	if( bSenderNotify && priv->from && *(priv->from) && strcmp(priv->from, "<>") != 0)
d7 4
a10 1
             if( smfi_addrcpt( context, priv->from ) != MI_SUCCESS )
d12 2
a13 2
@@@@ -585,7 +585,7 @@@@
         syslog( LOG_MAIL | LOG_ERR, "daemon return error (%s) - possible problem with daemon", getDaemonCode( status ) );
d15 5
a19 5
     } /* else - normal message */
-    syslog( LOG_MAIL | LOG_INFO, "Complite proccessing message from %s", priv->from );
+    syslog( LOG_MAIL | LOG_INFO, "Complete processing message from %s", priv->from );
     free_private_data( priv );
     if( set_private_data( context, NULL ) != MI_SUCCESS )
a20 9
@@@@ -643,7 +643,7 @@@@
     priv = get_private_data( context );
     if( priv )
     {
-        syslog( LOG_MAIL | LOG_INFO, "Abort proccessing message from %s", priv->from );
+	syslog( LOG_MAIL | LOG_INFO, "Abort processing message from %s", priv->from );
         free_private_data( priv );
         if( set_private_data( context, NULL ) != MI_SUCCESS )
         {
@


1.3
log
@Yet one spelling
@
text
@d2 10
a11 1
+++ dw_filter.c	Thu Aug 30 00:23:31 2001
d30 9
@


1.2
log
@Don't attempt to notify empty <> sender
@
text
@d17 1
a17 1
+    syslog( LOG_MAIL | LOG_INFO, "Complete proccessing message from %s", priv->from );
@


1.1
log
@Spelling fix
@
text
@d1 11
a11 2
--- dw_filter.c.bak	Mon Jul 30 05:12:02 2001
+++ dw_filter.c	Sat Aug 25 15:27:15 2001
@

