take ENETUNREACH (Network unreachable) as a transient error -- this

probably isn't usually right, but it seem safer in the long run....

SCCS-mr: usr.sbin/sendmail/src/version.c 131
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 3.41
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.275

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index 7ceaa8f..a51f5b9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -3,7 +3,7 @@
 # include <sys/mx.h>
 
 #ifndef DAEMON
 # include <sys/mx.h>
 
 #ifndef DAEMON

-SCCSID(@(#)daemon.c    3.40            %G%     (w/o daemon mode));
+SCCSID(@(#)daemon.c    3.41            %G%     (w/o daemon mode));

 #else
 
 #include <sys/socket.h>
 #else
 
 #include <sys/socket.h>


@@ -11,7 +11,7 @@ SCCSID(@(#)daemon.c   3.40            %G%     (w/o daemon mode));
 #include <netdb.h>
 #include <wait.h>
 
 #include <netdb.h>
 #include <wait.h>
 

-SCCSID(@(#)daemon.c    3.40            %G%     (with daemon mode));
+SCCSID(@(#)daemon.c    3.41            %G%     (with daemon mode));

 
 /*
 **  DAEMON.C -- routines to use when running as a daemon.
 
 /*
 **  DAEMON.C -- routines to use when running as a daemon.


@@ -253,6 +253,7 @@ makeconnection(host, port, outfile, infile)
                  case ENOBUFS:
                  case ECONNREFUSED:
                  case EHOSTUNREACH:
                  case ENOBUFS:
                  case ECONNREFUSED:
                  case EHOSTUNREACH:

+                 case ENETUNREACH:

                        /* there are others, I'm sure..... */
                        return (EX_TEMPFAIL);
 
                        /* there are others, I'm sure..... */
                        return (EX_TEMPFAIL);
 


@@ -265,7 +266,7 @@ makeconnection(host, port, outfile, infile)
        *outfile = fdopen(s, "w");
        *infile = fdopen(s, "r");
 
        *outfile = fdopen(s, "w");
        *infile = fdopen(s, "r");
 

-       return (0);
+       return (EX_OK);

 }
 
 #endif DAEMON
 }
 
 #endif DAEMON

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 1a1d980..3708891 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.274 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.275 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.274 [%G%]";
+char   Version[] = "3.275 [%G%]";