@@ -1,6 +1,10 @@

+Mon Apr  9 04:43:54 BST 2007 (njh)

+----------------------------------

+  * clamav-milter:	EXPERIMENTAL:	Added not about notifications from

+  				the jail

 Mon Apr  9 04:26:56 BST 2007 (njh)

 ----------------------------------

-  * clamav-milter:	EXPERIMENAL: added --chroot

+  * clamav-milter:	EXPERIMENTAL: added --chroot

 Fri Apr  6 18:02:02 BST 2007 (njh)

 ----------------------------------

@@ -373,7 +373,12 @@ need to update the manual page and possibly the usage message as well.

 6. CHROOT JAIL

-The instructions will differ for you, but these will give you an idea

+The instructions will differ for you, but these will give you an idea.

+You will have to do a lot of fiddling if you want notifications to work,

+since clamav-milter calls sendmail to handle the notifications and sendmail

+will run of out the same jail. I've not disabled the notifications, but I

+may in the future - for the moment handling notifications in the jail is an

+excercise for the reader.

 	mkdir /var/run/clamav-root

 	chown clamav:clamav /var/run/clamav-root

@@ -394,6 +399,14 @@ The instructions will differ for you, but these will give you an idea

 	mkdir usr/local

 	mkdir usr/local/share

 	ln -s ../../../../../../usr/local/share/clamav .

+	mkdir usr/lib

+	cd usr/lib

+	ln -s ../../../../../usr/lib/sendmail .

+	cd ../..

+	mkdir dev

+	cd dev

+	mknod null c 1 3

+	chown clamav:clamav null

 In sendmail.mc:

 INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-root/var/run/clamav/clamav.sock, F=T, T=S:4m;R:4m;C:30s;E:10m')dnl

@@ -3594,7 +3594,7 @@ clamfi_eom(SMFICTX *ctx)

 				cli_dbgmsg("Waiting for %s to finish\n", cmd);

 				if(pclose(sendmail) != 0)

-					logg(_("%s: Failed to notify clamAV interception - see dead.letter"), sendmailId);

+					logg(_("%s: Failed to notify clamAV interception - see dead.letter\n"), sendmailId);

 			} else

 				logg(_("^Can't execute '%s' to send virus notice"), cmd);

 		}

@@ -6013,7 +6013,8 @@ black_hole(const struct privdata *privdata)

 					}

 				}

 			}

-			pclose(sendmail);

+			if(pclose(sendmail) != 0)

+				must_scan = 1;

 		} else {

 			logg(_("^Can't execute '%s' to expand '%s'"),

 				cmd, *to);

@@ -51,6 +51,10 @@ Print the version number and exit.

 .TP

 \fB-C DIR, \-\-chroot=DIR\fR

 Run in chroot jail DIR.

+.IP

+You will have to do a lot of fiddling if you want notifications to work,

+since clamav-milter calls \fBsendmail(8)\fR to handle the notifications and

+sendmail will run of out the same jail.

 .TP

 \fB\-c FILE, \-\-config\-file=FILE\fR

 By default clamav\-milter uses a default configuration file, this option allows you to specify another one.