You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2009/09/20 19:34:44 UTC
svn commit: r817057 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Author: jm
Date: Sun Sep 20 17:34:43 2009
New Revision: 817057
URL: http://svn.apache.org/viewvc?rev=817057&view=rev
Log:
bug 5929: avoid taint warnings if hostname is returned as '(none)'
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=817057&r1=817056&r2=817057&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sun Sep 20 17:34:43 2009
@@ -785,6 +785,7 @@
}
###########################################################################
+
{
my($hostname, $fq_hostname);
@@ -797,7 +798,7 @@
# got to clean PATH before we may call it.
clean_path_in_taint_mode();
$hostname = Sys::Hostname::hostname();
-
+ $hostname =~ s/[()]//gs; # bug 5929
return $hostname;
}
@@ -812,6 +813,7 @@
map { split } (gethostbyname($fq_hostname))[0 .. 1] # from all aliases
);
$fq_hostname = $names[0] if (@names); # take the first FQDN, if any
+ $fq_hostname =~ s/[()]//gs; # bug 5929
}
return $fq_hostname;