X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=f0586186a74496fe76cfd0a37446e4904de6dbf0;hp=3432acb7d094afd6508523254e3715e30d3177f1;hb=e32c697b3f60065a62cec197b507d0557183fe8a;hpb=851de39e0b19fb4bd49c386e0da048e987110b72

diff --git a/perlmail-accept b/perlmail-accept
index 3432acb..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)=@_;
@@ -498,11 +504,13 @@ sub _spamchildcode
 my($err,$isspam)=@_;
 
 	$err=$? if !defined $err;
-	return undef() if !WIFEXITED($?);
-	return undef() if  WIFSIGNALED($?);
-	return undef() if  WIFSTOPPED($?);
-	return $isspam||1 if  WEXITSTATUS($?);	# is-spam
-	return 0;	# not-spam
+	return undef()    if !WIFEXITED($?);
+	return undef()    if  WIFSIGNALED($?);
+	return undef()    if  WIFSTOPPED($?);
+	return 0 if !WEXITSTATUS($?);
+	return $isspam||1 if 1==WEXITSTATUS($?);	# isspam
+	cluck "Possible FIXME or your system is broken (WEXITSTATUS==".WEXITSTATUS($?).")";
+	return 0;	# simulate as not spam
 }
 
 # return: true (error-message or "1") if is spam
@@ -510,8 +518,9 @@ sub spamassassin
 {
 my($cmd)=@_;
 
-	$cmd||="$HOME/bin/spamassassin --exit-code";
-	# spamassassin has exit code 1 if IS spam, code 0 if NOT spam
+	$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;
 	local $SIG{"PIPE"}=sub { warn "spamassassin gave me SIGPIPE: broken pipe"; };
 	# prevent Razor2's: Can't call method "log" on unblessed reference at Razor2/Client/Agent.pm line 212.