HP-UX 10.0 portability changes

SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.154
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 8.129
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.157

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index e364440..04955bb 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.156 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.157 (Berkeley) %G%";

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


@@ -2009,12 +2009,21 @@ char    *DefaultUserShells[] =
        "/bin/csh",             /* C shell */
        "/usr/bin/csh",
 #ifdef __hpux
        "/bin/csh",             /* C shell */
        "/usr/bin/csh",
 #ifdef __hpux

+# ifdef V4FS
+       "/usr/bin/rsh",         /* restricted Bourne shell */
+       "/usr/bin/ksh",         /* Korn shell */
+       "/usr/bin/rksh",        /* restricted Korn shell */
+       "/usr/bin/pam",
+       "/usr/bin/keysh",       /* key shell (extended Korn shell) */
+       "/usr/bin/posix/sh",
+# else

        "/bin/rsh",             /* restricted Bourne shell */
        "/bin/ksh",             /* Korn shell */
        "/bin/rksh",            /* restricted Korn shell */
        "/bin/pam",
        "/usr/bin/keysh",       /* key shell (extended Korn shell) */
        "/bin/posix/sh",
        "/bin/rsh",             /* restricted Bourne shell */
        "/bin/ksh",             /* Korn shell */
        "/bin/rksh",            /* restricted Korn shell */
        "/bin/pam",
        "/usr/bin/keysh",       /* key shell (extended Korn shell) */
        "/bin/posix/sh",

+# endif

 #endif
 #ifdef _AIX3
        "/bin/ksh",             /* Korn shell */
 #endif
 #ifdef _AIX3
        "/bin/ksh",             /* Korn shell */

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 935d750..3b5934c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)conf.h      8.153 (Berkeley) %G%
+ *     @(#)conf.h      8.154 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -115,11 +115,13 @@
 
 /*
 **  HP-UX -- tested for 8.07, 9.00, and 9.01.
 
 /*
 **  HP-UX -- tested for 8.07, 9.00, and 9.01.

+**
+**     If V4FS is defined, compile for HP-UX 10.0.

 */
 
 #ifdef __hpux
 */
 
 #ifdef __hpux

-/* avoid m_flags conflict between db.h & sys/sysmacros.h on HP 300 */
-# undef m_flags
+               /* common definitions for HP-UX 9.x and 10.x */
+# undef m_flags                /* conflict between db.h & sys/sysmacros.h on HP 300 */

 # define SYSTEM5       1       /* include all the System V defines */
 # define HASINITGROUPS 1       /* has initgroups(3) call */
 # define HASSETREUID   1       /* has setreuid(2) call */
 # define SYSTEM5       1       /* include all the System V defines */
 # define HASINITGROUPS 1       /* has initgroups(3) call */
 # define HASSETREUID   1       /* has setreuid(2) call */


@@ -128,13 +130,6 @@
 # define SPT_TYPE      SPT_PSTAT
 # define SFS_TYPE      SFS_VFS /* use <sys/vfs.h> statfs() implementation */
 # define GIDSET_T      gid_t
 # define SPT_TYPE      SPT_PSTAT
 # define SFS_TYPE      SFS_VFS /* use <sys/vfs.h> statfs() implementation */
 # define GIDSET_T      gid_t

-# define _PATH_UNIX    "/hp-ux"
-# ifndef _PATH_SENDMAILCF
-#  define _PATH_SENDMAILCF     "/usr/lib/sendmail.cf"
-# endif
-# ifndef IDENTPROTO
-#  define IDENTPROTO   0       /* TCP/IP implementation is broken */
-# endif

 # ifndef HASGETUSERSHELL
 #  define HASGETUSERSHELL 0    /* getusershell(3) causes core dumps */
 # endif
 # ifndef HASGETUSERSHELL
 #  define HASGETUSERSHELL 0    /* getusershell(3) causes core dumps */
 # endif


@@ -142,6 +137,31 @@
 # ifdef __STDC__
 extern int     syslog(int, char *, ...);
 # endif
 # ifdef __STDC__
 extern int     syslog(int, char *, ...);
 # endif

+
+# ifdef V4FS
+               /* HP-UX 10.x */
+#  define _PATH_UNIX   "/stand/vmunix"
+#  ifndef _PATH_SENDMAILCF
+#   define _PATH_SENDMAILCF    "/etc/mail/sendmail.cf"
+#  endif
+#  ifndef _PATH_SENDMAILPID
+#   define _PATH_SENDMAILPID   "/etc/mail/sendmail.pid"
+#  endif
+#  ifndef IDENTPROTO
+#   define IDENTPROTO  1       /* TCP/IP implementation fixed in 10.0 */
+#  endif
+
+# else
+               /* HP-UX 9.x */
+#  define _PATH_UNIX   "/hp-ux"
+#  ifndef _PATH_SENDMAILCF
+#   define _PATH_SENDMAILCF    "/usr/lib/sendmail.cf"
+#  endif
+#  ifndef IDENTPROTO
+#   define IDENTPROTO  0       /* TCP/IP implementation is broken */
+#  endif
+# endif
+

 #endif
 
 
 #endif
 
 

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index 72d43de..2d33305 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sendmail.h  8.128 (Berkeley) %G%
+ *     @(#)sendmail.h  8.129 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -15,7 +15,7 @@
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint

-static char SmailSccsId[] =    "@(#)sendmail.h 8.128           %G%";
+static char SmailSccsId[] =    "@(#)sendmail.h 8.129           %G%";

 # endif
 # else /*  _DEFINE */
 # define EXTERN extern
 # endif
 # else /*  _DEFINE */
 # define EXTERN extern


@@ -895,6 +895,7 @@ union bigsockaddr
 
 #define VENDOR_BERKELEY        1       /* Berkeley-native configuration file */
 #define VENDOR_SUN     2       /* Sun-native configuration file */
 
 #define VENDOR_BERKELEY        1       /* Berkeley-native configuration file */
 #define VENDOR_SUN     2       /* Sun-native configuration file */

+#define VENDOR_HP      3       /* Hewlett-Packard specific config syntax */

 
 EXTERN int     VendorCode;     /* vendor-specific operation enhancements */
 \f/*
 
 EXTERN int     VendorCode;     /* vendor-specific operation enhancements */
 \f/*