diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2005-07-07 03:58:51 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2005-07-07 03:58:51 +0000 |
| commit | 162a416c1ac471deb1d6d5f077f496ed15b304e2 (patch) | |
| tree | caa5f8dfaaf2c15b497ff8a17e50612e4fb90504 /mail | |
| parent | - Remove forgotten patch (diff) | |
- fix CONF_AVFAILACTION for all scanners
Notes
Notes:
svn path=/head/; revision=138637
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/antivirus-milter/Makefile | 2 | ||||
| -rw-r--r-- | mail/antivirus-milter/files/patch-antivirus.c | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile index e7cabd55057b..da1479f04c16 100644 --- a/mail/antivirus-milter/Makefile +++ b/mail/antivirus-milter/Makefile @@ -7,7 +7,7 @@ PORTNAME= antivirus PORTVERSION= 3.30 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dinoex diff --git a/mail/antivirus-milter/files/patch-antivirus.c b/mail/antivirus-milter/files/patch-antivirus.c index 73d3cbb52498..684830317a48 100644 --- a/mail/antivirus-milter/files/patch-antivirus.c +++ b/mail/antivirus-milter/files/patch-antivirus.c @@ -1,5 +1,5 @@ --- antivirus.c.orig Tue Jul 15 21:27:14 2003 -+++ antivirus.c Wed Nov 17 07:19:12 2004 ++++ antivirus.c Mon Jun 20 17:45:16 2005 @@ -85,6 +85,8 @@ static char *FORMAT=NULL; static sfsistat avfailcode=0; @@ -39,7 +39,7 @@ + if ( retval == 2 ) + retval = 0; + } -+ ++ if (retval>0) { fseek(priv->childfp,0,SEEK_SET); @@ -58,7 +58,19 @@ { if (viruses[0]) strncat(viruses," ",sizeof(viruses)); -@@ -1211,6 +1233,7 @@ +@@ -572,10 +594,8 @@ + if (viruses[0]) + priv->viruses=strdup(viruses); + else +- priv->viruses=strdup("please contact postmaster"); +- +- if ((priv->viruses)==NULL) + { ++ priv->viruses=strdup("please contact postmaster"); + return(avfailcode); + } + return(SMFIS_REJECT); +@@ -1211,6 +1231,7 @@ if (AVFAILACTION==NULL) AVFAILACTION=CONF_AVFAILACTION; if (VIRUSACTION==NULL) VIRUSACTION=CONF_VIRUSACTION; @@ -66,7 +78,7 @@ if (strcasecmp(AVPRODUCT,"mcafee")==0) { FORMAT=FORMAT_MCAFEE; -@@ -1225,10 +1248,17 @@ +@@ -1225,10 +1246,17 @@ { FORMAT=FORMAT_FSAV; } |