System 5 compatibility, misc fixes

SCCS-vsn: usr.sbin/sendmail/src/recipient.c 6.5
SCCS-vsn: usr.sbin/sendmail/src/main.c 6.12
SCCS-vsn: usr.sbin/sendmail/src/envelope.c 6.4
SCCS-vsn: usr.sbin/sendmail/src/err.c 6.3
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 6.4
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 6.5
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 6.13
SCCS-vsn: usr.sbin/sendmail/src/queue.c 6.7
SCCS-vsn: usr.sbin/sendmail/src/conf.c 6.12
SCCS-vsn: usr.sbin/sendmail/src/alias.c 6.5
SCCS-vsn: usr.sbin/sendmail/src/udb.c 6.3
SCCS-vsn: usr.sbin/sendmail/src/map.c 6.3

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index a6df948..bad967c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -30,12 +30,16 @@ ERROR: DBM is no longer supported -- use NDBM instead.
 
 #ifndef lint
 #ifdef NEWDB
 
 #ifndef lint
 #ifdef NEWDB

-static char sccsid[] = "@(#)alias.c    6.4 (Berkeley) %G% (with NEWDB)";
+#ifdef NDBM
+static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (with NEWDB and NDBM)";
+#else
+static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (with NEWDB)";
+#endif

 #else
 #ifdef NDBM
 #else
 #ifdef NDBM

-static char sccsid[] = "@(#)alias.c    6.4 (Berkeley) %G% (with NDBM)";
+static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (with NDBM)";

 #else
 #else

-static char sccsid[] = "@(#)alias.c    6.4 (Berkeley) %G% (without NDBM)";
+static char sccsid[] = "@(#)alias.c    6.5 (Berkeley) %G% (without NEWDB or NDBM)";

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


@@ -573,7 +577,7 @@ readaliases(aliasfile, init, e)
                /*
                **  Process the LHS
                **
                /*
                **  Process the LHS
                **

-               **      Find the final colon, and parse the address.
+               **      Find the colon separator, and parse the address.

                **      It should resolve to a local name.
                **
                **      Alternatively, it can be "@hostname" for host
                **      It should resolve to a local name.
                **
                **      Alternatively, it can be "@hostname" for host

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 403b726..540e9ed 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     6.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     6.12 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <sys/ioctl.h>
 #endif /* not lint */
 
 # include <sys/ioctl.h>


@@ -554,12 +554,18 @@ rlsesigs()
 #  if defined(hpux)
 #    define LA_TYPE            LA_FLOAT
 #  endif
 #  if defined(hpux)
 #    define LA_TYPE            LA_FLOAT
 #  endif

-#  if defined(BSD)
-#    define LA_TYPE            LA_SUBR
-#  endif

 
 #  ifndef LA_TYPE
 
 #  ifndef LA_TYPE

-#    define LA_TYPE            LA_ZERO
+#   if defined(SYSTEM5)
+#    define LA_TYPE            LA_INT
+#    define LA_AVENRUN         "avenrun"
+#   else
+#    if defined(BSD)
+#     define LA_TYPE           LA_SUBR
+#    else
+#     define LA_TYPE           LA_ZERO
+#    endif
+#   endif

 #  endif
 #endif
 
 #  endif
 #endif
 


@@ -581,6 +587,9 @@ rlsesigs()
      /* powerful RISC/os */
 #    define _PATH_UNIX         "/unix"
 #  endif
      /* powerful RISC/os */
 #    define _PATH_UNIX         "/unix"
 #  endif

+#  if defined(SYSTEM5)
+#    define _PATH_UNIX         "/unix"
+#  endif

 #  ifndef _PATH_UNIX
 #    define _PATH_UNIX         "/vmunix"
 #  endif
 #  ifndef _PATH_UNIX
 #    define _PATH_UNIX         "/vmunix"
 #  endif


@@ -593,8 +602,14 @@ struct     nlist Nl[] =
        { 0 },
 };
 
        { 0 },
 };
 

+#if defined(unixpc)
+# define FSHIFT                5
+#endif
+

 #if (LA_TYPE == LA_INT) && !defined(FSHIFT)
 #  define FSHIFT       8
 #if (LA_TYPE == LA_INT) && !defined(FSHIFT)
 #  define FSHIFT       8

+#endif
+#if (LA_TYPE == LA_INT) && !defined(FSCALE)

 #  define FSCALE       (1 << FSHIFT)
 #endif
 
 #  define FSCALE       (1 << FSHIFT)
 #endif
 


@@ -607,26 +622,59 @@ getla()
        double avenrun[3];
 #endif
        extern off_t lseek();
        double avenrun[3];
 #endif
        extern off_t lseek();

+       extern char *errstring();
+       extern int errno;

 
        if (kmem < 0)
        {
                kmem = open("/dev/kmem", 0, 0);
                if (kmem < 0)
 
        if (kmem < 0)
        {
                kmem = open("/dev/kmem", 0, 0);
                if (kmem < 0)

+               {
+                       if (tTd(3, 1))
+                               printf("getla: open(/dev/kmem): %s\n",
+                                       errstring(errno));

                        return (-1);
                        return (-1);

+               }

                (void) fcntl(kmem, F_SETFD, 1);
                (void) fcntl(kmem, F_SETFD, 1);

-               nlist(_PATH_UNIX, Nl);
-               if (Nl[0].n_type == 0)
+               if (nlist(_PATH_UNIX, Nl) < 0)
+               {
+                       if (tTd(3, 1))
+                               printf("getla: nlist(%s): %s\n", _PATH_UNIX,
+                                       errstring(errno));

                        return (-1);
                        return (-1);

+               }

        }
        }

+       if (tTd(3, 20))
+               printf("getla: symbol address = %#x\n", Nl[X_AVENRUN].n_value);

        if (lseek(kmem, (off_t) Nl[X_AVENRUN].n_value, 0) == -1 ||
            read(kmem, (char *) avenrun, sizeof(avenrun)) < sizeof(avenrun))
        {
                /* thank you Ian */
        if (lseek(kmem, (off_t) Nl[X_AVENRUN].n_value, 0) == -1 ||
            read(kmem, (char *) avenrun, sizeof(avenrun)) < sizeof(avenrun))
        {
                /* thank you Ian */

+               if (tTd(3, 1))
+                       printf("getla: lseek or read: %s\n", errstring(errno));

                return (-1);
        }
 #if LA_TYPE == LA_INT
                return (-1);
        }
 #if LA_TYPE == LA_INT

+       if (tTd(3, 5))
+       {
+               printf("getla: avenrun = %d", avenrun[0]);
+               if (tTd(3, 15))
+                       printf(", %d, %d", avenrun[1], avenrun[2]);
+               printf("\n");
+       }
+       if (tTd(3, 1))
+               printf("getla: %d\n", (int) (avenrun[0] + FSCALE/2) >> FSHIFT);

        return ((int) (avenrun[0] + FSCALE/2) >> FSHIFT);
 #else
        return ((int) (avenrun[0] + FSCALE/2) >> FSHIFT);
 #else

+       if (tTd(3, 5))
+       {
+               printf("getla: avenrun = %g", avenrun[0]);
+               if (tTd(3, 15))
+                       printf(", %g, %g", avenrun[1], avenrun[2]);
+               printf("\n");
+       }
+       if (tTd(3, 1))
+               printf("getla: %d\n", (int) (avenrun[0] +0.5));

        return ((int) (avenrun[0] + 0.5));
 #endif
 }
        return ((int) (avenrun[0] + 0.5));
 #endif
 }


@@ -639,7 +687,13 @@ getla()
        double avenrun[3];
 
        if (getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0])) < 0)
        double avenrun[3];
 
        if (getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0])) < 0)

+       {
+               if (tTd(3, 1))
+                       perror("getla: getloadavg failed:");

                return (-1);
                return (-1);

+       }
+       if (tTd(3, 1))
+               printf("getla: %d\n", (int) (avenrun[0] +0.5));

        return ((int) (avenrun[0] + 0.5));
 }
 
        return ((int) (avenrun[0] + 0.5));
 }
 


@@ -647,6 +701,8 @@ getla()
 
 getla()
 {
 
 getla()
 {

+       if (tTd(3, 1))
+               printf("getla: ZERO\n");

        return (0);
 }
 
        return (0);
 }
 

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index d777207..8973956 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   6.3 (Berkeley) %G% (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c   6.4 (Berkeley) %G% (with daemon mode)";

 #else
 #else

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

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


@@ -257,59 +257,56 @@ makeconnection(host, port, mci, usesecureport)
        **  Try to actually open the connection.
        */
 
        **  Try to actually open the connection.
        */
 

-again:
-       if (tTd(16, 1))
-               printf("makeconnection (%s [%s])\n", host,
-                   inet_ntoa(addr.sin_addr));
-
-#ifdef NVMUNIX
-       s = socket(AF_INET, SOCK_STREAM, 0, 0);
-#else NVMUNIX
-       if (usesecureport)
+       for (;;)

        {
        {

-               int rport = IPPORT_RESERVED - 1;
+               if (tTd(16, 1))
+                       printf("makeconnection (%s [%s])\n", host,
+                           inet_ntoa(addr.sin_addr));

 
 

-               s = rresvport(&rport);
-       }
-       else
-       {
-               s = socket(AF_INET, SOCK_STREAM, 0);
-       }
-#endif NVMUNIX
-       if (s < 0)
-       {
-               sav_errno = errno;
-               syserr("makeconnection: no socket");
-               goto failure;
-       }
+               if (usesecureport)
+               {
+                       int rport = IPPORT_RESERVED - 1;

 
 

-       if (tTd(16, 1))
-               printf("makeconnection: fd=%d\n", s);
+                       s = rresvport(&rport);
+               }
+               else
+               {
+                       s = socket(AF_INET, SOCK_STREAM, 0);
+               }
+               if (s < 0)
+               {
+                       sav_errno = errno;
+                       syserr("makeconnection: no socket");
+                       goto failure;
+               }

 
 

-       /* turn on network debugging? */
-       if (tTd(16, 101))
-       {
-               int on = 1;
-               (void) setsockopt(DaemonSocket, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof on);
-       }
-       if (CurEnv->e_xfp != NULL)
-               (void) fflush(CurEnv->e_xfp);           /* for debugging */
-       errno = 0;                                      /* for debugging */
-#ifdef NVMUNIX
-       bind(s, &SendmailAddress, sizeof SendmailAddress, 0);
-       if (connect(s, &SendmailAddress, sizeof SendmailAddress, 0) < 0)
-#else NVMUNIX
-       addr.sin_family = AF_INET;
-       if (connect(s, (struct sockaddr *) &addr, sizeof addr) < 0)
-#endif NVMUNIX
-       {
+               if (tTd(16, 1))
+                       printf("makeconnection: fd=%d\n", s);
+
+               /* turn on network debugging? */
+               if (tTd(16, 101))
+               {
+                       int on = 1;
+                       (void) setsockopt(DaemonSocket, SOL_SOCKET, SO_DEBUG,
+                                         (char *)&on, sizeof on);
+               }
+               if (CurEnv->e_xfp != NULL)
+                       (void) fflush(CurEnv->e_xfp);           /* for debugging */
+               errno = 0;                                      /* for debugging */
+               addr.sin_family = AF_INET;
+               if (connect(s, (struct sockaddr *) &addr, sizeof addr) >= 0)
+                       break;
+
+               /* couldn't connect.... figure out why */

                sav_errno = errno;
                (void) close(s);
                if (hp && hp->h_addr_list[i])
                {
                sav_errno = errno;
                (void) close(s);
                if (hp && hp->h_addr_list[i])
                {

+                       if (tTd(16, 1))
+                               printf("Connect failed; trying new address....\n");

                        bcopy(hp->h_addr_list[i++], (char *) &addr.sin_addr,
                                        hp->h_length);
                        bcopy(hp->h_addr_list[i++], (char *) &addr.sin_addr,
                                        hp->h_length);

-                       goto again;
+                       continue;

                }
 
                /* failure, decide if temporary or not */
                }
 
                /* failure, decide if temporary or not */

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 9d5fee4..e6d7eb0 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)deliver.c  6.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)deliver.c  6.13 (Berkeley) %G%";

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


@@ -919,15 +919,19 @@ openmailer(m, pvp, ctladdr, clever, e)
                                if (ctladdr == NULL || ctladdr->q_uid == 0)
                                {
                                        (void) setgid(DefGid);
                                if (ctladdr == NULL || ctladdr->q_uid == 0)
                                {
                                        (void) setgid(DefGid);

+#ifndef SYSTEM5

                                        (void) initgroups(DefUser, DefGid);
                                        (void) initgroups(DefUser, DefGid);

+#endif

                                        (void) setuid(DefUid);
                                }
                                else
                                {
                                        (void) setgid(ctladdr->q_gid);
                                        (void) setuid(DefUid);
                                }
                                else
                                {
                                        (void) setgid(ctladdr->q_gid);

+#ifndef SYSTEM5

                                        (void) initgroups(ctladdr->q_ruser?
                                                ctladdr->q_ruser: ctladdr->q_user,
                                                ctladdr->q_gid);
                                        (void) initgroups(ctladdr->q_ruser?
                                                ctladdr->q_ruser: ctladdr->q_user,
                                                ctladdr->q_gid);

+#endif

                                        (void) setuid(ctladdr->q_uid);
                                }
                        }
                                        (void) setuid(ctladdr->q_uid);
                                }
                        }


@@ -1359,14 +1363,18 @@ mailfile(filename, ctladdr, e)
                        if (ctladdr->q_uid == 0)
                        {
                                (void) setgid(DefGid);
                        if (ctladdr->q_uid == 0)
                        {
                                (void) setgid(DefGid);

+#ifndef SYSTEM5

                                (void) initgroups(DefUser, DefGid);
                                (void) initgroups(DefUser, DefGid);

+#endif

                        }
                        else
                        {
                                (void) setgid(ctladdr->q_gid);
                        }
                        else
                        {
                                (void) setgid(ctladdr->q_gid);

+#ifndef SYSTEM5

                                (void) initgroups(ctladdr->q_ruser ?
                                        ctladdr->q_ruser : ctladdr->q_user,
                                        ctladdr->q_gid);
                                (void) initgroups(ctladdr->q_ruser ?
                                        ctladdr->q_ruser : ctladdr->q_user,
                                        ctladdr->q_gid);

+#endif

                        }
                }
                if (!bitset(S_ISUID, mode) || setuid(stb.st_uid) < 0)
                        }
                }
                if (!bitset(S_ISUID, mode) || setuid(stb.st_uid) < 0)

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index 3bae080..e88d7a0 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)envelope.c 6.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)envelope.c 6.4 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -15,6 +15,7 @@ static char sccsid[] = "@(#)envelope.c        6.3 (Berkeley) %G%";
 #include <sys/stat.h>
 #include <pwd.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <sys/file.h>

+#include <sys/fcntl.h>

 #include "sendmail.h"
 
 /*
 #include "sendmail.h"
 
 /*

diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 5b8ced4..f1fdf1c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)err.c      6.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)err.c      6.3 (Berkeley) %G%";

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


@@ -395,9 +395,11 @@ errstring(errno)
                (void) sprintf(buf, "Connection refused by %s", CurHostName);
                return (buf);
 
                (void) sprintf(buf, "Connection refused by %s", CurHostName);
                return (buf);
 

+# ifdef NAMED_BIND

          case (TRY_AGAIN+MAX_ERRNO):
                (void) sprintf(buf, "Host Name Lookup Failure");
                return (buf);
          case (TRY_AGAIN+MAX_ERRNO):
                (void) sprintf(buf, "Host Name Lookup Failure");
                return (buf);

+# endif

        }
 # endif
 # endif
        }
 # endif
 # endif

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 0115fe9..4cfafe6 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,19 +13,22 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     6.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     6.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 
 #include <unistd.h>
 #include <sys/file.h>
 #endif /* not lint */
 
 #define        _DEFINE
 
 #include <unistd.h>
 #include <sys/file.h>

+#include <sys/fcntl.h>

 #include <sys/stat.h>
 #include <signal.h>
 #include <sgtty.h>
 #include "sendmail.h"
 #include <sys/stat.h>
 #include <signal.h>
 #include <sgtty.h>
 #include "sendmail.h"

+#ifdef NAMED_BIND

 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <arpa/nameser.h>
 #include <resolv.h>

+#endif

 
 # ifdef lint
 char   edata, end;
 
 # ifdef lint
 char   edata, end;


@@ -1243,7 +1246,11 @@ disconnect(fulldrop)
        /* drop our controlling TTY completely if possible */
        if (fulldrop)
        {
        /* drop our controlling TTY completely if possible */
        if (fulldrop)
        {

+#ifdef SYSTEM5
+               (void) setpgrp();
+#else

                (void) setsid();
                (void) setsid();

+#endif

 #ifdef TIOCNOTTY
                fd = open("/dev/tty", 2);
                if (fd >= 0)
 #ifdef TIOCNOTTY
                fd = open("/dev/tty", 2);
                if (fd >= 0)

diff --git a/usr/src/usr.sbin/sendmail/src/map.c b/usr/src/usr.sbin/sendmail/src/map.c
index 9bb8fac..866746b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/map.c
+++ b/usr/src/usr.sbin/sendmail/src/map.c
@@ -7,11 +7,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "sendmail.h"
 #include <sys/file.h>
 #endif /* not lint */
 
 #include "sendmail.h"
 #include <sys/file.h>

+#include <sys/fcntl.h>

 
 #ifdef DBM_MAP
 #include <ndbm.h>
 
 #ifdef DBM_MAP
 #include <ndbm.h>

diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index efc604f..257e31f 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #ifdef QUEUE
 
 #ifndef lint
 #ifdef QUEUE

-static char sccsid[] = "@(#)queue.c    6.6 (Berkeley) %G% (with queueing)";
+static char sccsid[] = "@(#)queue.c    6.7 (Berkeley) %G% (with queueing)";

 #else
 #else

-static char sccsid[] = "@(#)queue.c    6.6 (Berkeley) %G% (without queueing)";
+static char sccsid[] = "@(#)queue.c    6.7 (Berkeley) %G% (without queueing)";

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


@@ -25,6 +25,9 @@ static char sccsid[] = "@(#)queue.c   6.6 (Berkeley) %G% (without queueing)";
 # ifdef LOCKF
 # include <fcntl.h>
 # endif
 # ifdef LOCKF
 # include <fcntl.h>
 # endif

+# ifdef SYSTEM5
+# include <dirent.h>
+# endif

 
 # ifdef QUEUE
 
 
 # ifdef QUEUE
 

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 6e1c56d..07429d2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)readcf.c   6.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c   6.5 (Berkeley) %G%";

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


@@ -18,6 +18,17 @@ static char sccsid[] = "@(#)readcf.c 6.4 (Berkeley) %G%";
 # include <resolv.h>
 #endif
 
 # include <resolv.h>
 #endif
 

+/* System 5 compatibility */
+#ifndef S_ISREG
+#define S_ISREG(foo)   ((foo & S_IFREG) == S_IFREG)
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP                020
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH                002
+#endif
+

 /*
 **  READCF -- read control file.
 **
 /*
 **  READCF -- read control file.
 **

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 225f990..646d7b6 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -7,12 +7,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        6.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        6.5 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <sys/file.h>
 #endif /* not lint */
 
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <sys/file.h>

+# include <sys/fcntl.h>

 # include <pwd.h>
 # include "sendmail.h"
 
 # include <pwd.h>
 # include "sendmail.h"
 

diff --git a/usr/src/usr.sbin/sendmail/src/udb.c b/usr/src/usr.sbin/sendmail/src/udb.c
index 35b228f..3e367f2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/udb.c
+++ b/usr/src/usr.sbin/sendmail/src/udb.c
@@ -8,9 +8,9 @@
 
 #ifndef lint
 #ifdef USERDB
 
 #ifndef lint
 #ifdef USERDB

-static char sccsid [] = "@(#)udb.c     6.2 (Berkeley) %G% (with USERDB)";
+static char sccsid [] = "@(#)udb.c     6.3 (Berkeley) %G% (with USERDB)";

 #else
 #else

-static char sccsid [] = "@(#)udb.c     6.2 (Berkeley) %G% (without USERDB)";
+static char sccsid [] = "@(#)udb.c     6.3 (Berkeley) %G% (without USERDB)";

 #endif
 #endif
 
 #endif
 #endif
 


@@ -157,8 +157,6 @@ udbexpand(a, sendq, e)
        for (up = UdbEnts; !breakout; up++)
        {
                char *user;
        for (up = UdbEnts; !breakout; up++)
        {
                char *user;

-               struct timeval timeout;
-               fd_set fdset;

 
                /*
                **  Select action based on entry type.
 
                /*
                **  Select action based on entry type.