Import sendmail 8.12.10

3 files changed, 5 insertions, 4 deletions

diff --git a/contrib/sendmail/contrib/domainmap.m4 b/contrib/sendmail/contrib/domainmap.m4
index 540beff..6d56e84 100644
--- a/contrib/sendmail/contrib/domainmap.m4
+++ b/contrib/sendmail/contrib/domainmap.m4
@@ -46,7 +46,7 @@ divert(-1)changequote(<<, >>)<<
    in the sendmail source tree.  For more information, please see the
    following URL:
 
-      http://www-dev.cso.uiuc.edu/sendmail/domainmap/
+      http://www-dev.cites.uiuc.edu/sendmail/domainmap/
 
    Feedback is welcome.
 
diff --git a/contrib/sendmail/contrib/doublebounce.pl b/contrib/sendmail/contrib/doublebounce.pl
index 12601d3..dc26ab8 100644
--- a/contrib/sendmail/contrib/doublebounce.pl
+++ b/contrib/sendmail/contrib/doublebounce.pl
@@ -36,7 +36,7 @@
 
 use Socket;
 use Getopt::Std;
-use POSIX;
+use File::Temp;
 use Sys::Syslog qw(:DEFAULT setlogsock);
 use strict;
 use vars qw( $opt_d $tmpfile);
@@ -125,7 +125,7 @@ sub main {
 
   # The bounced e-mail may be large, so we'd better not try to buffer
   # it in memory, get a temporary file.
-  $tmpfile = POSIX::tmpnam();
+  $tmpfile = tmpnam();
 
   if (!open(MSG, ">$tmpfile")) {
     syslog('err', "Unable to open temporary file $tmpfile");
diff --git a/contrib/sendmail/contrib/expn.pl b/contrib/sendmail/contrib/expn.pl
index d67fb0f..85de08a 100755
--- a/contrib/sendmail/contrib/expn.pl
+++ b/contrib/sendmail/contrib/expn.pl
@@ -8,6 +8,7 @@
 
 use 5.001;
 use IO::Socket;
+use Fcntl;
 
 # system requirements:
 # 	must have 'nslookup' and 'hostname' programs.
@@ -999,7 +1000,7 @@ sub mxlookup
 	}
 
 	$0 = "$av0 - nslookup of $server";
-	open(T,">/tmp/expn$$") || die "open > /tmp/expn$$: $!\n";
+	sysopen(T,"/tmp/expn$$",O_RDWR|O_CREAT|O_EXCL,0600) || die "open > /tmp/expn$$: $!\n";
 	print T "set querytype=MX\n";
 	print T "$server\n";
 	close(T);