fix compile problems on various platforms

SCCS-vsn: usr.sbin/sendmail/src/makesendmail 8.23
SCCS-vsn: usr.sbin/sendmail/src/convtime.c 8.4
SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.162
SCCS-vsn: usr.sbin/sendmail/src/domain.c 8.38
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 8.90
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.170
SCCS-vsn: usr.sbin/sendmail/src/map.c 8.62

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 9e111e5..4a37d01 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     8.169 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.170 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -2975,8 +2975,8 @@ sm_getpwuid(uid)
 */
 
 #ifdef SIOCGIFCONF
 */
 
 #ifdef SIOCGIFCONF

-# include <netdb.h>

 # include <arpa/inet.h>
 # include <arpa/inet.h>

+# include <sys/time.h>

 # include <net/if.h>
 #endif
 
 # include <net/if.h>
 #endif
 

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index c10a252..5603597 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,13 +5,15 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)conf.h      8.161 (Berkeley) %G%
+ *     @(#)conf.h      8.162 (Berkeley) %G%

  */
 
 /*
 **  CONF.H -- All user-configurable parameters for sendmail
 */
 
  */
 
 /*
 **  CONF.H -- All user-configurable parameters for sendmail
 */
 

+struct rusage; /* forward declaration to get gcc to shut up in wait.h */
+

 # include <sys/param.h>
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <sys/param.h>
 # include <sys/types.h>
 # include <sys/stat.h>


@@ -182,6 +184,7 @@ extern int  syslog(int, char *, ...);
 # define HASUNAME      1       /* use System V uname(2) system call */
 # define HASGETUSERSHELL 0     /* does not have getusershell(3) call */
 # define FORK          fork    /* no vfork primitive available */
 # define HASUNAME      1       /* use System V uname(2) system call */
 # define HASGETUSERSHELL 0     /* does not have getusershell(3) call */
 # define FORK          fork    /* no vfork primitive available */

+# define GIDSET_T      gid_t

 # define SFS_TYPE      SFS_STATFS      /* use <sys/statfs.h> statfs() impl */
 # define SPT_PADCHAR   '\0'    /* pad process title with nulls */
 # define LA_TYPE       LA_INT
 # define SFS_TYPE      SFS_STATFS      /* use <sys/statfs.h> statfs() impl */
 # define SPT_PADCHAR   '\0'    /* pad process title with nulls */
 # define LA_TYPE       LA_INT


@@ -445,6 +448,7 @@ typedef int         pid_t;
 # include <sys/cdefs.h>
 # define ERRLIST_PREDEFINED    /* don't declare sys_errlist */
 # define BSD4_4_SOCKADDR       /* has sa_len */
 # include <sys/cdefs.h>
 # define ERRLIST_PREDEFINED    /* don't declare sys_errlist */
 # define BSD4_4_SOCKADDR       /* has sa_len */

+# define NETLINK               /* supports AF_LINK */

 # ifndef LA_TYPE
 #  define LA_TYPE      LA_SUBR
 # endif
 # ifndef LA_TYPE
 #  define LA_TYPE      LA_SUBR
 # endif


@@ -464,6 +468,7 @@ typedef int         pid_t;
 # include <sys/cdefs.h>
 # define ERRLIST_PREDEFINED    /* don't declare sys_errlist */
 # define BSD4_4_SOCKADDR       /* has sa_len */
 # include <sys/cdefs.h>
 # define ERRLIST_PREDEFINED    /* don't declare sys_errlist */
 # define BSD4_4_SOCKADDR       /* has sa_len */

+# define NETLINK               /* supports AF_LINK */

 # define SFS_TYPE      SFS_MOUNT       /* use <sys/mount.h> statfs() impl */
 # ifndef LA_TYPE
 #  define LA_TYPE      LA_SUBR
 # define SFS_TYPE      SFS_MOUNT       /* use <sys/mount.h> statfs() impl */
 # ifndef LA_TYPE
 #  define LA_TYPE      LA_SUBR


@@ -501,6 +506,7 @@ typedef int         pid_t;
 # include <sys/cdefs.h>
 # define ERRLIST_PREDEFINED    /* don't declare sys_errlist */
 # define BSD4_4_SOCKADDR       /* has sa_len */
 # include <sys/cdefs.h>
 # define ERRLIST_PREDEFINED    /* don't declare sys_errlist */
 # define BSD4_4_SOCKADDR       /* has sa_len */

+# define NETLINK               /* supports AF_LINK */

 # ifndef LA_TYPE
 #  define LA_TYPE      LA_SUBR
 # endif
 # ifndef LA_TYPE
 #  define LA_TYPE      LA_SUBR
 # endif

diff --git a/usr/src/usr.sbin/sendmail/src/convtime.c b/usr/src/usr.sbin/sendmail/src/convtime.c
index 84e667f..cbd8517 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/convtime.c
+++ b/usr/src/usr.sbin/sendmail/src/convtime.c
@@ -7,10 +7,11 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)convtime.c 8.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)convtime.c 8.4 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <ctype.h>
 #endif /* not lint */
 
 # include <ctype.h>

+# include <string.h>

 # include "useful.h"
 
 /*
 # include "useful.h"
 
 /*

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index b7b6339..7eb14b2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -12,9 +12,9 @@
 
 #ifndef lint
 #ifdef DAEMON
 
 #ifndef lint
 #ifdef DAEMON

-static char sccsid[] = "@(#)daemon.c   8.89 (Berkeley) %G% (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.90 (Berkeley) %G% (with daemon mode)";

 #else
 #else

-static char sccsid[] = "@(#)daemon.c   8.89 (Berkeley) %G% (without daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.90 (Berkeley) %G% (without daemon mode)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -937,7 +937,7 @@ host_map_lookup(map, name, av, statp)
 **             A printable version of that sockaddr.
 */
 
 **             A printable version of that sockaddr.
 */
 

-#ifdef AF_LINK
+#ifdef NETLINK

 # include <net/if_dl.h>
 #endif
 
 # include <net/if_dl.h>
 #endif
 


@@ -972,7 +972,7 @@ anynet_ntoa(sap)
                return inet_ntoa(sap->sin.sin_addr);
 #endif
 
                return inet_ntoa(sap->sin.sin_addr);
 #endif
 

-#ifdef AF_LINK
+#ifdef NETLINK

          case AF_LINK:
                sprintf(buf, "[LINK: %s]",
                        link_ntoa((struct sockaddr_dl *) &sap->sa));
          case AF_LINK:
                sprintf(buf, "[LINK: %s]",
                        link_ntoa((struct sockaddr_dl *) &sap->sa));

diff --git a/usr/src/usr.sbin/sendmail/src/domain.c b/usr/src/usr.sbin/sendmail/src/domain.c
index cfc2296..988a9a0 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/domain.c
+++ b/usr/src/usr.sbin/sendmail/src/domain.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #if NAMED_BIND
 
 #ifndef lint
 #if NAMED_BIND

-static char sccsid[] = "@(#)domain.c   8.37 (Berkeley) %G% (with name server)";
+static char sccsid[] = "@(#)domain.c   8.38 (Berkeley) %G% (with name server)";

 #else
 #else

-static char sccsid[] = "@(#)domain.c   8.37 (Berkeley) %G% (without name server)";
+static char sccsid[] = "@(#)domain.c   8.38 (Berkeley) %G% (without name server)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -147,7 +147,7 @@ getmxrr(host, mxhosts, droplocalhost, rcode)
                        goto punt;
 
                  case HOST_NOT_FOUND:
                        goto punt;
 
                  case HOST_NOT_FOUND:

-#ifdef BROKEN_RES_SEARCH
+#if BROKEN_RES_SEARCH

                  case 0:       /* Ultrix resolver retns failure w/ h_errno=0 */
 #endif
                        /* host doesn't exist in DNS; might be in /etc/hosts */
                  case 0:       /* Ultrix resolver retns failure w/ h_errno=0 */
 #endif
                        /* host doesn't exist in DNS; might be in /etc/hosts */

diff --git a/usr/src/usr.sbin/sendmail/src/makesendmail b/usr/src/usr.sbin/sendmail/src/makesendmail
index a5a7b66..8a87f0f 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/makesendmail
+++ b/usr/src/usr.sbin/sendmail/src/makesendmail
@@ -6,7 +6,7 @@
 #
 # %sccs.include.redist.sh%
 #
 #
 # %sccs.include.redist.sh%
 #

-#       @(#)makesendmail       8.22 (Berkeley) %G%
+#       @(#)makesendmail       8.23 (Berkeley) %G%

 #
 
 #
 #
 
 #


@@ -69,6 +69,7 @@ in
   DYNIX-ptx)   os=PTX;;
   Paragon*)    os=Paragon;;
   HP-UX)       rel=`echo $rel | sed -e 's/^[^.]*\.0*//'`;;
   DYNIX-ptx)   os=PTX;;
   Paragon*)    os=Paragon;;
   HP-UX)       rel=`echo $rel | sed -e 's/^[^.]*\.0*//'`;;

+  AIX)         rel=`uname -v`;;

 esac
 
 # get "base part" of operating system release
 esac
 
 # get "base part" of operating system release

diff --git a/usr/src/usr.sbin/sendmail/src/map.c b/usr/src/usr.sbin/sendmail/src/map.c
index 7a97626..69c6c08 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/map.c
+++ b/usr/src/usr.sbin/sendmail/src/map.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)map.c      8.61 (Berkeley) %G%";
+static char sccsid[] = "@(#)map.c      8.62 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -2450,7 +2450,7 @@ prog_map_lookup(map, name, av, statp)
        i = read(fd, buf, sizeof buf - 1);
        if (i <= 0 && tTd(38, 2))
                printf("prog_map_lookup(%s): read error %s\n",
        i = read(fd, buf, sizeof buf - 1);
        if (i <= 0 && tTd(38, 2))
                printf("prog_map_lookup(%s): read error %s\n",

-                       map->map_mname, strerror(errno));
+                       map->map_mname, errstring(errno));

        if (i > 0)
        {
                char *rval;
        if (i > 0)
        {
                char *rval;