update to sendmail 8.11.5

3 files changed, 25 insertions, 16 deletions

diff --git a/gnu/usr.sbin/sendmail/libmilter/README b/gnu/usr.sbin/sendmail/libmilter/README
index 2e7c69de064..aacaadfa5bf 100644
--- a/gnu/usr.sbin/sendmail/libmilter/README
+++ b/gnu/usr.sbin/sendmail/libmilter/README
@@ -59,14 +59,14 @@ Filters are specified with a key letter ``X'' (for ``eXternal'').
 For example:
 
 	Xfilter1, S=local:/var/run/f1.sock, F=R
-	Xfilter2, S=inet6:999@localhost, F=T, T=S:1s;R:1s;E:5m
+	Xfilter2, S=inet6:999@localhost, F=T, T=C:10m;S:1s;R:1s;E:5m
 	Xfilter3, S=inet:3333@localhost
 
 specifies three filters.  Filters can be specified in your .mc file using
 the following:
 
 	INPUT_MAIL_FILTER(`filter1', `S=local:/var/run/f1.sock, F=R')
-	INPUT_MAIL_FILTER(`filter2', `S=inet6:999@localhost, F=T, T=S:1s;R:1s;E:5m')
+	INPUT_MAIL_FILTER(`filter2', `S=inet6:999@localhost, F=T, T=C:10m;S:1s;R:1s;E:5m')
 	INPUT_MAIL_FILTER(`filter3', `S=inet:3333@localhost')
 
 The first attaches to a Unix-domain socket in the /var/run directory; the
@@ -80,19 +80,21 @@ If neither F=R nor F=T is specified, the message is passed through sendmail
 as if the filter were not present.
 
 Finally, you can override the default timeouts used by sendmail when
-talking to the filters using the T= equate.  There are three fields inside
+talking to the filters using the T= equate.  There are four fields inside
 of the T= equate:
 
 Letter          Meaning
-  S             Timeout for sending information from the MTA to a filter
-  R             Timeout for reading reply from the filter
-  E             Overall timeout between sending end-of-message to filter
-                and waiting for the final acknowledgment
+  C		Timeout for connecting to a filter (if 0, use system timeout)
+  S		Timeout for sending information from the MTA to a filter
+  R		Timeout for reading reply from the filter
+  E		Overall timeout between sending end-of-message to filter
+		and waiting for the final acknowledgment
 
 Note the separator between each is a ';' as a ',' already separates equates
-and therefore can't separate timeouts.  The default values (if not set in the config) are:
+and therefore can't separate timeouts.  The default values (if not set in
+the config) are:
 
-T=S:10s;R:10s;E:5m
+T=C:0m;S:10s;R:10s;E:5m
 
 where 's' is seconds and 'm' is minutes.
 
@@ -424,4 +426,4 @@ main(argc, argv)
 
 /* eof */
 
-$Revision: 1.6 $, Last updated $Date: 2001/05/29 01:31:12 $
+$Revision: 1.7 $, Last updated $Date: 2001/08/01 01:01:40 $
diff --git a/gnu/usr.sbin/sendmail/libmilter/libmilter.h b/gnu/usr.sbin/sendmail/libmilter/libmilter.h
index 9109051adff..d826f972368 100644
--- a/gnu/usr.sbin/sendmail/libmilter/libmilter.h
+++ b/gnu/usr.sbin/sendmail/libmilter/libmilter.h
@@ -17,7 +17,7 @@
 # define EXTERN
 # define INIT(x)	= x
 # ifndef lint
-static char MilterlId[] = "@(#)$Sendmail: libmilter.h,v 8.3.6.14 2001/05/27 14:31:12 ca Exp $";
+static char MilterlId[] = "@(#)$Sendmail: libmilter.h,v 8.3.6.16 2001/06/07 23:21:35 geir Exp $";
 # endif /* ! lint */
 #else /* _DEFINE */
 # define EXTERN extern
diff --git a/gnu/usr.sbin/sendmail/libmilter/sm_gethost.c b/gnu/usr.sbin/sendmail/libmilter/sm_gethost.c
index 246b1947202..57b102f236d 100644
--- a/gnu/usr.sbin/sendmail/libmilter/sm_gethost.c
+++ b/gnu/usr.sbin/sendmail/libmilter/sm_gethost.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char id[] = "@(#)$Sendmail: sm_gethost.c,v 8.7.8.10 2001/05/09 20:57:12 gshapiro Exp $";
+static char id[] = "@(#)$Sendmail: sm_gethost.c,v 8.7.8.11 2001/07/21 00:10:23 gshapiro Exp $";
 #endif /* ! lint */
 
 #if _FFR_MILTER
@@ -31,12 +31,15 @@ static char id[] = "@(#)$Sendmail: sm_gethost.c,v 8.7.8.10 2001/05/09 20:57:12 g
 
 #if NETINET6 && NEEDSGETIPNODE
 
-# ifndef AI_V4MAPPED
-#  define AI_V4MAPPED	0	/* dummy */
-# endif /* ! AI_V4MAPPED */
+# ifndef AI_ADDRCONFIG
+#  define AI_ADDRCONFIG	0	/* dummy */
+# endif /* ! AI_ADDRCONFIG */
 # ifndef AI_ALL
 #  define AI_ALL	0	/* dummy */
 # endif /* ! AI_ALL */
+# ifndef AI_DEFAULT
+#  define AI_DEFAULT	0	/* dummy */
+# endif /* ! AI_DEFAULT */
 
 static struct hostent *
 getipnodebyname(name, family, flags, err)
@@ -97,11 +100,15 @@ mi_gethostbyname(name, family)
 # endif /* SOLARIS == 20300 || SOLARIS == 203 */
 #else /* (SOLARIS > 10000 && SOLARIS < 20400) || (defined(SOLARIS) && SOLARIS < 204) || (defined(sony_news) && defined(__svr4)) */
 # if NETINET6
+	int flags = AI_DEFAULT|AI_ALL;
 	int err;
 # endif /* NETINET6 */
 
 # if NETINET6
-	h = getipnodebyname(name, family, AI_V4MAPPED|AI_ALL, &err);
+#  if ADDRCONFIG_IS_BROKEN
+	flags &= ~AI_ADDRCONFIG;
+#  endif /* ADDRCONFIG_IS_BROKEN */
+	h = getipnodebyname(name, family, flags, &err);
 	SM_SET_H_ERRNO(err);
 # else /* NETINET6 */
 	h = gethostbyname(name);