Print this page
XXXX update sendmail to 8.14.9

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1998-2009 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2011 Proofpoint, Inc. and its suppliers.
  *      All rights reserved.
  * Copyright (c) 1983, 1995-1997 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
  *      The Regents of the University of California.  All rights reserved.
  *

@@ -8,19 +8,14 @@
  * By using this file, you agree to the terms and conditions set
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
  *
- *      $Id: conf.h,v 1.139 2009/06/16 23:41:32 ca Exp $
+ *      $Id: conf.h,v 1.147 2013-11-22 20:51:31 ca Exp $
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
 **  CONF.H -- All user-configurable parameters for sendmail
 **
 **      Send updates to Sendmail.ORG so they will be
 **      included in the next release; see
 **      http://www.sendmail.org/email-addresses.html

@@ -384,10 +379,16 @@
 #  ifdef SOLARIS
                         /* Solaris 2.x (a.k.a. SunOS 5.x) */
 #   ifndef __svr4__
 #    define __svr4__            /* use all System V Release 4 defines below */
 #   endif /* ! __svr4__ */
+#   if SOLARIS >= 21100
+#    include <paths.h>
+#   endif /* SOLARIS >= 21100 */
+#   ifndef _PATH_VARRUN
+#    define _PATH_VARRUN        "/var/run/"
+#   endif /* _PATH_VARRUN */
 #   define GIDSET_T     gid_t
 #   define USE_SA_SIGACTION     1       /* use sa_sigaction field */
 #   define BROKEN_PTHREAD_SLEEP 1       /* sleep after pthread_create() fails */
 #   define HASSTRERROR  1       /* has strerror(3) */
 #   ifndef _PATH_UNIX

@@ -446,11 +447,11 @@
 #    endif /* ! LA_TYPE */
 #    define HASGETUSERSHELL 1   /* getusershell(3c) bug fixed in 2.7 */
 #   endif /* SOLARIS >= 20700 || (SOLARIS < 10000 && SOLARIS >= 207) */
 #   if SOLARIS >= 20800 || (SOLARIS < 10000 && SOLARIS >= 208)
 #    undef _PATH_SENDMAILPID    /* tmpfs /var/run added in 2.8 */
-#    define _PATH_SENDMAILPID   "/var/run/sendmail.pid"
+#    define _PATH_SENDMAILPID   _PATH_VARRUN "sendmail.pid"
 #    ifndef SMRSH_CMDDIR
 #     define SMRSH_CMDDIR       "/var/adm/sm.bin"
 #    endif /* ! SMRSH_CMDDIR */
 #    define SL_FUDGE    34      /* fudge offset for SyslogPrefixLen */
 #    define HASLDAPGETALIASBYNAME       1       /* added in S8 */

@@ -464,10 +465,12 @@
 #    define HASUNSETENV 1       /* unsetenv() added in S10 */
 #   endif /* SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) */
 #   if SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211)
 #    define GETLDAPALIASBYNAME_VERSION 2        /* changed in S11 */
 #    define HAVE_NANOSLEEP      1       /* moved from librt to libc in S11 */
+#    define SOCKADDR_LEN_T      socklen_t       /* arg#3 to accept, getsockname */
+#    define SOCKOPT_LEN_T       socklen_t       /* arg#5 to getsockopt */
 #   endif /* SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211) */
 #   ifndef HASGETUSERSHELL
 #    define HASGETUSERSHELL 0   /* getusershell(3) causes core dumps pre-2.7 */
 #   endif /* ! HASGETUSERSHELL */
 

@@ -1017,10 +1020,13 @@
 #     define SPT_TYPE   SPT_BUILTIN
 #    endif /* __FreeBSD_version >= 199512 */
 #    if __FreeBSD_version >= 222000     /* 2.2.2-release and later */
 #     define HASSETUSERCONTEXT  1       /* BSDI-style login classes */
 #    endif /* __FreeBSD_version >= 222000 */
+#    if __FreeBSD_version >= 300000     /* 3.0.0-release and later */
+#     define HAVE_NANOSLEEP     1       /* has nanosleep(2) */
+#    endif /* __FreeBSD_version >= 300000 */
 #    if __FreeBSD_version >= 330000     /* 3.3.0-release and later */
 #     ifndef SMRSH_CMDDIR
 #      define SMRSH_CMDDIR      "/usr/libexec/sm.bin"
 #     endif /* ! SMRSH_CMDDIR */
 #     ifndef SMRSH_PATH

@@ -1058,10 +1064,13 @@
 #    define HASCLOSEFROM        1       /* closefrom(3) added in 3.5 */
 #   endif /* OpenBSD >= 200405 */
 #   if OpenBSD >= 200505
 #    undef NETISO       /* iso.h removed in 3.7 */
 #   endif /* OpenBSD >= 200505 */
+#   if OpenBSD >= 200800
+#    define HAVE_NANOSLEEP      1       /* has nanosleep(2) */
+#   endif /* OpenBSD >= 200800 */
 #  endif /* defined(__OpenBSD__) */
 # endif /* defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */
 
 
 /*

@@ -1521,10 +1530,12 @@
    **  in 2.1 and later, but the APIs appear before the functions.
    */
 #   if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 #    define GLIBC_VERSION ((__GLIBC__ << 8) + __GLIBC_MINOR__)
 #    if (GLIBC_VERSION >= 0x201)
+#     define SOCKADDR_LEN_T     socklen_t
+#     define SOCKOPT_LEN_T      socklen_t
 #     undef IPPROTO_ICMPV6      /* linux #defines, glibc enums */
 #    else /* (GLIBC_VERSION >= 0x201) */
 #     include <linux/in6.h>     /* IPv6 support */
 #    endif /* (GLIBC_VERSION >= 0x201) */
 #    if (GLIBC_VERSION >= 0x201 && !defined(NEEDSGETIPNODE))

@@ -2811,11 +2822,11 @@
 # endif /* !defined(MAXHOSTNAMELEN) && !defined(_SCO_unix_) && !defined(NonStop_UX_BXX) && !defined(ALTOS_SYSTEM_V) */
 
 
 # if _FFR_LINUX_MHNL && defined(__linux__) && MAXHOSTNAMELEN < 255
    /*
-   **  override Linux wierdness: a FQHN can be 255 chars long
+   **  override Linux weirdness: a FQHN can be 255 chars long
    **  SUSv3 requires HOST_NAME_MAX ("Maximum length of a host
    **  name (not including the terminating null) as returned from the
    **  gethostname() function.") to be at least 255.  c.f.:
    **  http://www.opengroup.org/onlinepubs/009695399
    **  but Linux defines that to 64 too.

@@ -2952,10 +2963,15 @@
 /* XXX  32 bit type */
 # ifndef SM_INT32
 #  define SM_INT32      int32_t
 # endif /* ! SM_INT32 */
 
+/* XXX  16 bit type */
+# ifndef SM_UINT16
+#  define SM_UINT16     uint16_t
+# endif /* ! SM_UINT16 */
+
 /*
 **  SVr4 and similar systems use different routines for setjmp/longjmp
 **  with signal support
 */
 

@@ -3034,6 +3050,8 @@
 };
 #  define SM_ALIGN_SIZE offsetof(struct sm_align, al_u)
 # endif /* ! SM_ALIGN_SIZE */
 # define SM_ALIGN_BITS (SM_ALIGN_SIZE - 1)
 
+char *sm_inet6_ntop __P((const void *, char *, size_t));
+
 #endif /* ! SM_CONF_H */