]>
Commit | Line | Data |
---|---|---|
1 | diff -urN amavisd-snapshot-20020300.org/amavis/amavisd.conf.in amavisd-snapshot-20020300/amavis/amavisd.conf.in | |
2 | --- amavisd-snapshot-20020300.org/amavis/amavisd.conf.in Thu Jun 6 22:33:49 2002 | |
3 | +++ amavisd-snapshot-20020300/amavis/amavisd.conf.in Thu Jun 6 22:41:33 2002 | |
4 | @@ -25,6 +25,9 @@ | |
5 | # NOTE: don't forget to re-run ./configure if you want to use | |
6 | # another virus scanner! | |
7 | ||
8 | +# mks_vir Antivirus (mks32) | |
9 | +$mksvir = "@mksvir@"; | |
10 | + | |
11 | # NAI AntiVirus (uvscan) | |
12 | $uvscan = "@uvscan@"; | |
13 | ||
14 | diff -urN amavisd-snapshot-20020300.org/amavis/amavisd.in amavisd-snapshot-20020300/amavis/amavisd.in | |
15 | --- amavisd-snapshot-20020300.org/amavis/amavisd.in Thu Jun 6 22:33:49 2002 | |
16 | +++ amavisd-snapshot-20020300/amavis/amavisd.in Thu Jun 6 22:44:39 2002 | |
17 | @@ -87,7 +87,7 @@ | |
18 | # Av scanners and related vars | |
19 | use vars qw ( $antivir $avp $avpdc $AVPDIR $csav $fprot $fsav $inocucmd $nod32 | |
20 | $nod32cli $oav $panda $rav $sophos $sophos_ide_path $cscmdline $scs_host $scs_port $uvscan $vbengcl $vscan | |
21 | - $vfind $sophie_sockname $trophie_sockname ); | |
22 | + $vfind $sophie_sockname $trophie_sockname $mksvir ); | |
23 | ||
24 | use vars qw ( $QUARANTINEDIR $VIRUSFILE $viruslist @virusname | |
25 | $warnadmin $warnsender $warnrecip $warn_offsite @local_domains ); | |
26 | @@ -357,6 +357,7 @@ | |
27 | @cyber_scanner_frag@ | |
28 | @fprot_scanner_frag@ | |
29 | @fsec_scanner_frag@ | |
30 | +@mksvir_scanner_frag@ | |
31 | @hbedv_scanner_frag@ | |
32 | @nai_scanner_frag@ | |
33 | @nod32_scanner_frag@ | |
34 | diff -urN amavisd-snapshot-20020300.org/amavis/av/mksvir amavisd-snapshot-20020300/amavis/av/mksvir | |
35 | --- amavisd-snapshot-20020300.org/amavis/av/mksvir Thu Jan 1 01:00:00 1970 | |
36 | +++ amavisd-snapshot-20020300/amavis/av/mksvir Thu Jun 6 22:48:09 2002 | |
37 | @@ -0,0 +1,35 @@ | |
38 | +# | |
39 | +# mks_vir (www.mks.com.pl) | |
40 | +# | |
41 | + | |
42 | + | |
43 | +if ($mksvir) { | |
44 | + do_log(2, "Using $mksvir"); | |
45 | + chop($output = `$mksvir -s $TEMPDIR/parts/* 2>&1`); | |
46 | + $errval = retcode($?); | |
47 | + $scanner_errors &= $errval; | |
48 | + do_log(2,$output); | |
49 | + if ($errval) { | |
50 | + if ($errval == 1) { | |
51 | + @virusname = ($output =~ /file.*virus (.+)/g); | |
52 | + do_virus($output); | |
53 | + } else { | |
54 | + do_log(0,"Virus scanner failure: $antivir (error code: $errval)"); | |
55 | + } | |
56 | + } | |
57 | +} | |
58 | + | |
59 | +# --------- or'ed exit codes -------- | |
60 | +# =================================== | |
61 | +# | |
62 | +# 0 OK | |
63 | +# | |
64 | +# 1 virus FOUND | |
65 | +# 2 file repaired | |
66 | +# 4 file DELETED | |
67 | +# | |
68 | +# 128 0x80 internal error | |
69 | +# 256 0x100 commandline options error | |
70 | +# 512 0x200 initialization error | |
71 | +# 1024 0x400 IO error | |
72 | + | |
73 | diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in | |
74 | --- amavisd-snapshot-20020300.org/configure.in Thu Jun 6 22:33:49 2002 | |
75 | +++ amavisd-snapshot-20020300/configure.in Thu Jun 6 22:43:26 2002 | |
76 | @@ -390,6 +390,7 @@ | |
77 | fprot_scanner_frag=$srcdir/amavis/av/fprot | |
78 | fsec_scanner_frag=$srcdir/amavis/av/fsec | |
79 | hbedv_scanner_frag=$srcdir/amavis/av/hbedv | |
80 | + mksvir_scanner_frag=$srcdir/amavis/av/mksvir | |
81 | nai_scanner_frag=$srcdir/amavis/av/nai | |
82 | nod32_scanner_frag=$srcdir/amavis/av/nod32 | |
83 | nod32cli_scanner_frag=$srcdir/amavis/av/nod32cli | |
84 | @@ -500,6 +501,20 @@ | |
85 | hbedv_scanner_frag=$srcdir/amavis/av/hbedv | |
86 | fi | |
87 | ||
88 | +mksvir_scanner_frag=/dev/null | |
89 | +AC_CHECKING([*** mks_vir AntiVirus ***]) | |
90 | +AC_PATH_PROGS(mksvir, mks32, , $PATH:/usr/bin:/usr/local/bin) | |
91 | +if test "x$mksvir" = "x" ; then | |
92 | + AC_MSG_WARN([************************************************************]) | |
93 | + AC_MSG_WARN([*** mks_vir AntiVirus NOT found ***]) | |
94 | + AC_MSG_WARN([*** but that's ok ***]) | |
95 | + AC_MSG_WARN([************************************************************]) | |
96 | +else | |
97 | + # This is the first one | |
98 | + avscanner=" mks_vir AntiVirus" | |
99 | + mksvir_scanner_frag=$srcdir/amavis/av/mksvir | |
100 | +fi | |
101 | + | |
102 | ### McAfee Virusscan | |
103 | nai_scanner_frag=/dev/null | |
104 | AC_CHECKING([*** McAfee Virusscan ***]) | |
105 | @@ -683,7 +698,7 @@ | |
106 | ||
107 | ||
108 | AC_MSG_CHECKING([if any virus scanners are installed at all]) | |
109 | -if test "x$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$nod32cli$csav$vbengcl$sophie$trophie$panda$fprot$oav$cscmdline" = "x" ; then | |
110 | +if test "x$mksvir$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$nod32cli$csav$vbengcl$sophie$trophie$panda$fprot$oav$cscmdline" = "x" ; then | |
111 | AC_MSG_RESULT([no]) | |
112 | AC_MSG_ERROR([ | |
113 | ||
114 | @@ -838,6 +853,7 @@ | |
115 | AC_SUBST_FILE(cyber_scanner_frag) | |
116 | AC_SUBST_FILE(fsec_scanner_frag) | |
117 | AC_SUBST_FILE(hbedv_scanner_frag) | |
118 | +AC_SUBST_FILE(mksvir_scanner_frag) | |
119 | AC_SUBST_FILE(nai_scanner_frag) | |
120 | AC_SUBST_FILE(nod32_scanner_frag) | |
121 | AC_SUBST_FILE(nod32cli_scanner_frag) |