[src/netbsd-1-5]: src/gnu/dist/sendmail Pull up revisions 1.3-1.5 (requested ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8e4580975831
branches:  netbsd-1-5
changeset: 490789:8e4580975831
user:      he <he%NetBSD.org@localhost>
date:      Fri Mar 09 17:50:03 2001 +0000

description:
Pull up revisions 1.3-1.5 (requested by itojun):
  Upgrade to sendmail 8.11.3.

diffstat:

 gnu/dist/sendmail/devtools/bin/find_m4.sh |  13 +++++++------
 gnu/dist/sendmail/libmilter/sm_gethost.c  |  26 ++++++++++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diffs (118 lines):

diff -r 2911fb1a1496 -r 8e4580975831 gnu/dist/sendmail/devtools/bin/find_m4.sh
--- a/gnu/dist/sendmail/devtools/bin/find_m4.sh Fri Mar 09 17:50:01 2001 +0000
+++ b/gnu/dist/sendmail/devtools/bin/find_m4.sh Fri Mar 09 17:50:03 2001 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
 #      All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
 # the sendmail distribution.
 #
 #
-#       Id: find_m4.sh,v 8.7 1999/02/07 07:25:58 gshapiro Exp
+#       Id: find_m4.sh,v 8.7.24.4 2001/01/23 01:48:03 gshapiro Exp
 #
 
 # Try to find a working M4 program.
@@ -20,11 +20,13 @@
 \`errprint(\`You need a newer version of M4, at least as new as System V or GNU')
 include(NoSuchFile)')
 define(\`BadNumber', \`10')
-ifdef(\`BadNumber', \`', \`errprint(\`This version of m4 is broken')')"
+ifdef(\`BadNumber', \`',
+\`errprint(\`This version of m4 is broken: trailing zero problem')
+include(NoSuchFile)')"
 
 if [ "$M4" ]
 then
-       err=`(echo "$test" | $M4) 2>&1 >/dev/null`
+       err="`(echo "$test" | $M4) 2>&1 >/dev/null`"
        code=$?
 else
        firstfound=
@@ -36,7 +38,7 @@
                        [ -z "$dir" ] && dir=.
                        if [ -f $dir/$m4 ]
                        then
-                               err=`(echo "$test" | $dir/$m4) 2>&1 >/dev/null`
+                               err="`(echo "$test" | $dir/$m4) 2>&1 >/dev/null`"
                                ret=$?
                                if [ $ret -eq 0 -a "X$err" = "X" ]
                                then
@@ -80,4 +82,3 @@
 fi
 echo $M4
 exit 0
-
diff -r 2911fb1a1496 -r 8e4580975831 gnu/dist/sendmail/libmilter/sm_gethost.c
--- a/gnu/dist/sendmail/libmilter/sm_gethost.c  Fri Mar 09 17:50:01 2001 +0000
+++ b/gnu/dist/sendmail/libmilter/sm_gethost.c  Fri Mar 09 17:50:03 2001 +0000
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+ *  Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
  *     All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
-static char id[] = "@(#)Id: sm_gethost.c,v 8.7 2000/01/20 21:51:52 geir Exp";
+static char id[] = "@(#)Id: sm_gethost.c,v 8.7.8.6 2001/02/14 04:07:23 gshapiro Exp";
 #endif /* ! lint */
 
 #if _FFR_MILTER
@@ -39,7 +39,7 @@
 # endif /* ! AI_ALL */
 
 static struct hostent *
-mi_getipnodebyname(name, family, flags, err)
+getipnodebyname(name, family, flags, err)
        char *name;
        int family;
        int flags;
@@ -54,13 +54,27 @@
                resv6 = bitset(RES_USE_INET6, _res.options);
                _res.options |= RES_USE_INET6;
        }
-       h_errno = 0;
+       SM_SET_H_ERRNO(0);
        h = gethostbyname(name);
        *err = h_errno;
        if (family == AF_INET6 && !resv6)
                _res.options &= ~RES_USE_INET6;
        return h;
 }
+
+# if _FFR_FREEHOSTENT
+void
+freehostent(h)
+       struct hostent *h;
+{
+       /*
+       **  Stub routine -- if they don't have getipnodeby*(),
+       **  they probably don't have the free routine either.
+       */
+
+       return;
+}
+# endif /* _FFR_FREEHOSTENT */
 #endif /* NEEDSGETIPNODE && NETINET6 && __RES < 19990909 */
 
 struct hostent *
@@ -87,8 +101,8 @@
 # endif /* NETINET6 */
 
 # if NETINET6
-       h = mi_getipnodebyname(name, family, AI_V4MAPPED|AI_ALL, &err);
-       h_errno = err;
+       h = getipnodebyname(name, family, AI_V4MAPPED|AI_ALL, &err);
+       SM_SET_H_ERRNO(err);
 # else /* NETINET6 */
        h = gethostbyname(name);
 # endif /* NETINET6 */