X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=f0586186a74496fe76cfd0a37446e4904de6dbf0;hp=f2e12ec13f7c7ca3efb767870eaf317897283d90;hb=e32c697b3f60065a62cec197b507d0557183fe8a;hpb=33153507e6b498c5f7c6d653bb494661fa7438a3

diff --git a/perlmail-accept b/perlmail-accept
index f2e12ec..f058618 100755
--- a/perlmail-accept
+++ b/perlmail-accept
@@ -166,7 +166,7 @@ sub useridle
 	my($idlebest,$linebest);
 	for my $utmp (User::Utmp::getut(),{ "ut_line"=>"psaux" }) {
 		local $_;
-		next if defined($_=$utmp->{"ut_type"}) && $_!=User::Utmp::USER_PROCESS;
+		next if defined($_=$utmp->{"ut_type"}) && $_!=User::Utmp::USER_PROCESS();
 		next if defined($_=$utmp->{"ut_user"}) && !$valid_users{$_};
 		my $line="/dev/".$utmp->{"ut_line"};
 		my $atime=(stat $line)[8];
@@ -192,6 +192,12 @@ sub body_first
 	return $first;
 }
 
+sub is_multipart
+{
+	return 0 if !$Audit->is_mime();
+	return $Audit->is_multipart();
+}
+
 sub mimehead
 {
 my($part)=@_;
@@ -512,7 +518,7 @@ sub spamassassin
 {
 my($cmd)=@_;
 
-	$cmd||="$HOME/bin/spamassassin --exit-code 1";
+	$cmd||="spamassassin --exit-code 1";
 	# spamassassin has the specified exit code if IS spam, code 0 if NOT spam
 	# See &_spamchildcode for the code 1.
 	local *CHILD;