initial illumos port

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index ac114b69754159e204a200c66383e6fd93d2578a..14015924af6c219d017968456e6aaea0418b78b3 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -14,6 +14,8 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 
 #ifdef BeforeVendorCF
 
+# define LocalThreadsDefines
+
 # include <host.def>
 
 /* CDE uses a .C suffix for C++ source, not the default .cxx */
@@ -71,6 +73,8 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 #  define X11ProjectRoot       /usr
 # elif defined(FreeBSDArchitecture)
 #  define X11ProjectRoot       /usr/local
+# elif defined(SunArchitecture)
+#  define X11ProjectRoot       /usr
 # elif defined(OpenBSDArchitecture)
 #  define X11ProjectRoot       /usr/X11R6
 # elif defined(NetBSDArchitecture)

diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index d07aa84f4aba0a08f4d06b600eb5035e41f165da..d47d097d6ddc30620fc2c506d8d859a8fe706c26 100644 (file)
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -178,7 +178,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #   define XawI18nDefines    -DHAS_WCHAR_H -DHAS_ISW_FUNCS
 #  endif
 # endif
-# if OSMinorVersion > 3
+# if OSMinorVersion > 10
+#  define InstallCmd       /usr/bin/ginstall
+# elif OSMinorVersion > 3
 #  define InstallCmd       /usr/ucb/install
 # endif
 # ifdef i386Architecture
@@ -333,10 +335,17 @@ man_keywords::                                                            @@\
 
 #if !defined(UsePamLibrary)
 # if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4))
-#  define UsePamLibrary                YES
+#  define UsePamLibrary                NO
 # endif
 #endif
 
+#if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 10))
+#define SharedLibXau YES
+#define SharedXauRev 6
+#define SharedLibXdmcp YES
+#define SharedXdmcpRev 6
+#endif
+
 #define MotifDefines                   \
        -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
 #define PamUnixDefines         -DPAM_NIS

diff --git a/cde/config/cf/sunLib.tmpl b/cde/config/cf/sunLib.tmpl
index a21919c2779f33f4a564ad7cb7beea5da8e8dc7b..0e8c8c2f68e23160bbfb638ff0272ffcdef8618a 100644 (file)
--- a/cde/config/cf/sunLib.tmpl
+++ b/cde/config/cf/sunLib.tmpl
@@ -77,7 +77,7 @@ ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
 UNSHARED_CXXLIB = -static -lC
 #  elif HasSunCplusplus
 #   if CplusplusCompilerMajorVersion > 3
-UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
+UNSHARED_CXXLIB = -lC
 #   else
 UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
 #   endif

diff --git a/cde/lib/DtHelp/Layout.c b/cde/lib/DtHelp/Layout.c
index bb939ed187373e8cc85e42caccaf21418970dc24..909046338bf3194226ff25cf075629e5c27f4209 100644 (file)
--- a/cde/lib/DtHelp/Layout.c
+++ b/cde/lib/DtHelp/Layout.c
@@ -332,7 +332,7 @@ static      const   _DtCvSegmentI   BlankTableCell =
        _DtCvCONTAINER,         /* type         */
        -1,                     /* link_idx     */
          {                     /* container info */
-           { NULL },             /* id           */
+           NULL,                 /* id           */
            NULL,                 /* justify_char */
            _DtCvDYNAMIC,         /* type         */
            _DtCvBORDER_NONE,     /* border       */

diff --git a/cde/lib/DtSvc/DtUtil2/SunDtHelp.c b/cde/lib/DtSvc/DtUtil2/SunDtHelp.c
index b6c66c5ea3a22b4b3d63447cb7b33cc30ae3bf7a..bb72ed489a9ee7d2a585979c568488caf57ec475 100644 (file)
--- a/cde/lib/DtSvc/DtUtil2/SunDtHelp.c
+++ b/cde/lib/DtSvc/DtUtil2/SunDtHelp.c
@@ -77,7 +77,7 @@ int SUNWDtHelpdlopen()
 
     _DtSvcProcessLock();
     pmySUNWProcList = (SUNWHelpProcList *)malloc(sizeof(SUNWHelpProcList));
-    libDtHelpHandle = dlopen("libDtHelp.so.1", RTLD_LAZY | RTLD_GLOBAL);
+    libDtHelpHandle = dlopen("libDtHelp.so.2.1", RTLD_LAZY | RTLD_GLOBAL);
     if (libDtHelpHandle == NULL) {
        char *my_err_msg;
 

diff --git a/cde/lib/DtSvc/Imakefile b/cde/lib/DtSvc/Imakefile
index e3e9908bf5457c2130919e13db4501fad29e69b3..f2dc2f7229b12d0f4a954aa98e5206d1f3fb1748 100644 (file)
--- a/cde/lib/DtSvc/Imakefile
+++ b/cde/lib/DtSvc/Imakefile
@@ -30,7 +30,7 @@ INCLUDES = -I.
 
 #ifdef SharedDtSvcReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedDtSvcReqs -L/opt/SUNWspro/SC4.0/lib -Bstatic -lC
+REQUIREDLIBS = SharedDtSvcReqs -lC -lCrun
 SHLIBLDFLAGS = -G
 #else
 REQUIREDLIBS = SharedDtSvcReqs

diff --git a/cde/lib/DtSvc/include/bms/sbstdinc.h b/cde/lib/DtSvc/include/bms/sbstdinc.h
index ed5ae36bf7dbee191ea83acd3ed9f841ea7bf263..8061e5a7d6b458a9db22cf479d831090979be373 100644 (file)
--- a/cde/lib/DtSvc/include/bms/sbstdinc.h
+++ b/cde/lib/DtSvc/include/bms/sbstdinc.h
@@ -62,7 +62,7 @@
 #if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)
 
 #if defined(__STDC__)
-#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_)
+#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_) && !defined(sun)
 extern void bcopy(char *b1, char *b2, int length);
 extern int  bcmp(char *b1, char *b2, int length);
 extern void bzero(char *b, int length);

diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h
index 346f3845543b3bf472bbbc8b544fe23256f0afa9..5981603d711e19dd32e8db5e2d4b0824b543d363 100644 (file)
--- a/cde/lib/DtSvc/include/codelibs/stringx.h
+++ b/cde/lib/DtSvc/include/codelibs/stringx.h
@@ -75,7 +75,7 @@ extern "C"
 
 #ifdef __cplusplus
     char *strtokx(char *&ptr, const char *sep);
-# if !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED)
+# if !defined(__osf__) && !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
     char **strsep(const char *str, const char *sep,
        boolean whsp = TRUE, int *num = NULL);
 #  if !defined(__osf__)
@@ -85,7 +85,7 @@ extern "C"
 
 #else /* __STDC__ */
     char *strtokx(char **ptr, const char *sep);
-# if !defined(linux) && !defined(CSRG_BASED)
+# if !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
     char **strsep(const char *str, const char *sep,
        boolean whsp, int *num);
 #endif

diff --git a/cde/lib/tt/bin/shell/mover.C b/cde/lib/tt/bin/shell/mover.C
index f3072380f97c930449ac0445ce497f64aa4538ac..79e9cdd3c6376af1fd40f107d2d74aec7b185a42 100644 (file)
--- a/cde/lib/tt/bin/shell/mover.C
+++ b/cde/lib/tt/bin/shell/mover.C
@@ -38,7 +38,7 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #else
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL) && !defined(__uxp__) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif

diff --git a/cde/lib/tt/bin/shell/remover.C b/cde/lib/tt/bin/shell/remover.C
index f96b32ce4fd65980db15caf9ec66c9dee6864a48..68634d285fdfebac48a8c9cc5c84208be552565a 100644 (file)
--- a/cde/lib/tt/bin/shell/remover.C
+++ b/cde/lib/tt/bin/shell/remover.C
@@ -38,7 +38,7 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #else
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL) && !defined(__uxp__) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif

diff --git a/cde/lib/tt/bin/ttauth/ttauth.h b/cde/lib/tt/bin/ttauth/ttauth.h
index 32ccf1a285ea3284c287c1ef501a0baf475ffa45..80a1e33fdf4ccfa9be55ebdc9fcc17a8ca7cc5f0 100644 (file)
--- a/cde/lib/tt/bin/ttauth/ttauth.h
+++ b/cde/lib/tt/bin/ttauth/ttauth.h
@@ -58,7 +58,7 @@ typedef int Bool;
 
 extern char *ProgramName;
 
-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 extern char *malloc(), *realloc();
 #endif
 int process_command(), auth_initialize(), auth_finalize();

diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_globals.h b/cde/lib/tt/bin/ttdbserverd/db_server_globals.h
index 4ea174daab8b0d4108b1f0754cdc995a9f1a86b7..c20b5a503f6297c98fee1394c26d2e26d68c09d0 100644 (file)
--- a/cde/lib/tt/bin/ttdbserverd/db_server_globals.h
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_globals.h
@@ -38,6 +38,9 @@
 #define _DB_SERVER_GLOBALS_H
 
 #include <limits.h>
+#if !defined(NGROUPS)
+#define NGROUPS        NGROUPS_MAX
+#endif
 
 #if defined(OPT_GARBAGE_THREADS)
 #include <synch.h>

diff --git a/cde/lib/tt/bin/tttar/tttar.C b/cde/lib/tt/bin/tttar/tttar.C
index cf0875c8b5dcfc56251c74f4bab47cfda6d99396..bff0a3ed72500e69312ad211ba7d2f97cc964073 100644 (file)
--- a/cde/lib/tt/bin/tttar/tttar.C
+++ b/cde/lib/tt/bin/tttar/tttar.C
@@ -37,10 +37,10 @@
 #include <stdlib.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(sun) || defined(CSRG_BASED)
 #include <unistd.h>
 #else
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL) && !defined(__uxp__) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif

diff --git a/cde/lib/tt/bin/tttar/tttar_api.C b/cde/lib/tt/bin/tttar/tttar_api.C
index 29c002af2185a1de520e4ac0b51cece13a2c2826..7884003552e6a4b2d8833340a708e23e2df69eed 100644 (file)
--- a/cde/lib/tt/bin/tttar/tttar_api.C
+++ b/cde/lib/tt/bin/tttar/tttar_api.C
@@ -33,7 +33,7 @@
  */
 
 #include <errno.h>
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #ifndef USL

diff --git a/cde/lib/tt/bin/tttar/tttar_spec.C b/cde/lib/tt/bin/tttar/tttar_spec.C
index 659bf6ffa6e57b373d7befe3fe9ddffff8abcd04..4833de67b9c226b1459c1bbc15604884602f7526 100644 (file)
--- a/cde/lib/tt/bin/tttar/tttar_spec.C
+++ b/cde/lib/tt/bin/tttar/tttar_spec.C
@@ -32,7 +32,7 @@
  *
  */
 
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #if defined (USL) || defined(__uxp__)

diff --git a/cde/lib/tt/lib/Imakefile b/cde/lib/tt/lib/Imakefile
index 54b4876a661308b78098e332bee119d35962166e..9660c370c6fe69abcfdbfcc73307742ccee0cc27 100644 (file)
--- a/cde/lib/tt/lib/Imakefile
+++ b/cde/lib/tt/lib/Imakefile
@@ -45,7 +45,7 @@ INCLUDES = -I.
 
 #ifdef SharedTtReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedTtReqs -L/opt/SUNWspro/SC4.0/lib -Bstatic -lC
+REQUIREDLIBS = SharedTtReqs -lC -lCrun
 SHLIBLDFLAGS = -G
 #else
 REQUIREDLIBS = SharedTtReqs

diff --git a/cde/lib/tt/lib/mp/mp_message.C b/cde/lib/tt/lib/mp/mp_message.C
index 06afb24539697b1d218fc4d920a3e51e2a2e7ebe..02687e3c593e8ca58a9c840353a8503a03f15d93 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_message.C
+++ b/cde/lib/tt/lib/mp/mp_message.C
@@ -1284,7 +1284,7 @@ print(const _Tt_ostream &os) const
                os << "otype:\t\t" << _otype << "\n";
        }
        if (! _sender.is_null()) {
-               os << "sender:\t\t[" << _uid << "/" << _gid << "] ";
+               os << "sender:\t\t[" << (unsigned long)_uid << "/" << (unsigned long)_gid << "] ";
                _sender->print( os );
        }
        if (_sender_ptype.len() > 0) {

diff --git a/cde/lib/tt/lib/util/tt_host.C b/cde/lib/tt/lib/util/tt_host.C
index 60e80512bf1cbad66b57359a589bea2f6a7463b6..223007b21584e1d6018e5747e45e7768807845b6 100644 (file)
--- a/cde/lib/tt/lib/util/tt_host.C
+++ b/cde/lib/tt/lib/util/tt_host.C
@@ -48,7 +48,7 @@ extern "C" in_addr_t inet_addr(const char *);
 #ifdef __osf__
 #include <unistd.h>
 #else
-#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif /* __osf */

diff --git a/cde/lib/tt/lib/util/tt_log.C b/cde/lib/tt/lib/util/tt_log.C
index 48955ad2e856a5296822fe32d0469b81b0018aee..81c2d4c52563824356a1fbf050451ea8cfa8fec3 100644 (file)
--- a/cde/lib/tt/lib/util/tt_log.C
+++ b/cde/lib/tt/lib/util/tt_log.C
@@ -37,7 +37,7 @@
 #ifdef __osf__
 #include <unistd.h>
 #else
-#if !defined (USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined (USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 #endif /* __osf__ */

diff --git a/cde/lib/tt/lib/util/tt_xdr_utils.h b/cde/lib/tt/lib/util/tt_xdr_utils.h
index db1bfd3b297a4d6fe008fa61c76abe7faceb0fff..b450564fecc912d95b3981aff15c9066c02baf10 100644 (file)
--- a/cde/lib/tt/lib/util/tt_xdr_utils.h
+++ b/cde/lib/tt/lib/util/tt_xdr_utils.h
@@ -55,7 +55,7 @@ class _Tt_xdr_size_stream : public _Tt_allocated {
 #ifdef __DECCXX
         XDR::xdr_ops ops;
 #else
-       struct XDR::xdr_ops ops;
+       struct xdr_ops ops;
 #endif
 };
 

diff --git a/cde/programs/dtappbuilder/src/libAButil/util.c b/cde/programs/dtappbuilder/src/libAButil/util.c
index 572873b2002f97880b9dabf5d87bd39869d8885e..f8a680543a3c34d80d9d2371ce674b9077822bbf 100644 (file)
--- a/cde/programs/dtappbuilder/src/libAButil/util.c
+++ b/cde/programs/dtappbuilder/src/libAButil/util.c
@@ -223,7 +223,7 @@ util_vfork()
 #ifdef __cplusplus
 extern "C" {
 #endif
-#if defined(__uxp__) || defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4)
+#if defined(__uxp__) || defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
     extern int putenv(const char *string);
 #elif !(defined(__osf__) || defined(__aix) || defined(__NetBSD__))
     extern int putenv(char *string);

diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c
index 3bfbdcf492b095ef6462fd9a1180791b454daefc..44e5aaadb7b239a8df2731d84fae1cc18c23de59 100644 (file)
--- a/cde/programs/dtcalc/calctool.c
+++ b/cde/programs/dtcalc/calctool.c
@@ -46,7 +46,7 @@
 #include "calctool.h"
 #include "ds_common.h"
 
-#ifdef sun
+#ifdef legacysun
 
 /* Copied from math.h */
 struct exception {

diff --git a/cde/programs/dtcreate/Imakefile b/cde/programs/dtcreate/Imakefile
index 559834e956aed0d24bce68d5aa0b7336e8498337..07180fb3d7da83c3f8fa6cab9a4382af910d65c7 100644 (file)
--- a/cde/programs/dtcreate/Imakefile
+++ b/cde/programs/dtcreate/Imakefile
@@ -42,7 +42,7 @@ SYS_LIBRARIES = -lm -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -L/opt/SUNWspro/SC2.0.1 -lC
+SYS_LIBRARIES = -lm -ldl -lC
 #endif /* SunArchitecture */
 
 #if defined (USLArchitecture)

diff --git a/cde/programs/dtdocbook/tcl/Imakefile b/cde/programs/dtdocbook/tcl/Imakefile
index 45aadcf39ba61e27912eb481de813d22d5ff547a..0b0af5c70d52e039f304b47f71d3f9354dcd7d32 100644 (file)
--- a/cde/programs/dtdocbook/tcl/Imakefile
+++ b/cde/programs/dtdocbook/tcl/Imakefile
@@ -30,7 +30,7 @@ TCL_LIBRARY = $(prefix)/tcl$(VERSION)
 
 #if defined(SunArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-       -DNO_UNION_WAIT -DHAVE_UNISTD_H \
+       -DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
        -DTCL_GOT_TIMEZONE
 
 #elif defined(IBMArchitecture)

diff --git a/cde/programs/dtinfo/tools/misc/msgsets.C b/cde/programs/dtinfo/tools/misc/msgsets.C
index e6a86c0dd248e043125c43d30bacb24b7cec3818..ae63714dc32b84382cf70c3312ae3c727bfaca4b 100644 (file)
--- a/cde/programs/dtinfo/tools/misc/msgsets.C
+++ b/cde/programs/dtinfo/tools/misc/msgsets.C
@@ -42,7 +42,7 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
-#if !defined(__DECCXX) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__DECCXX) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #else
 #include <unistd.h>

diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 84d11d92583f04a4436ae581d8bddc71f09e8ca0..7332e462e5c0dc3d3f8a81b0f70f0881df606521 100644 (file)
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -59,7 +59,14 @@ SOLARIS_OBJS =
 #endif
 
 #if defined(SunArchitecture) && !UsePamLibrary
+/* Unsure when libauth went away */
+#  if (OSMajorVersion == 5) && (OSMinorVersion < 5)
 PAM_LIB = -lauth
+#  else
+PAM_SRCS = pam_svc.c
+PAM_OBJS = pam_svc.o
+PAM_LIB = -lpam
+#  endif
 #endif
 
          XDMDIR = $(CDE_LOGFILES_TOP)
@@ -99,13 +106,12 @@ SYS_LIBRARIES = -lsec
  *      on Solaris 2.4 and run on Solaris 2.5.  In Solaris 2.4 some of 
  *       libcmd.a functions are also in libauth.so.  But on Solaris 2.5 
  *       these Sun private functions have been removed from libauth.so. */
-SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lC -lbsm -lcmd -lauth $(PAM_LIB)
+SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lC -lbsm -lcmd $(PAM_LIB)
+   EXTRA_DEFINES = -DPAM
 
 
 #  if UsePamLibrary
    EXTRA_DEFINES = -DPAM
-#  else
-   EXTRA_DEFINES = -DSUNAUTH
 #  endif
 #endif
 

diff --git a/cde/programs/dtlogin/pam_svc.c b/cde/programs/dtlogin/pam_svc.c
index e878d6cd1396d5598579875a495c790fb84dce56..4b25251374ba541c981806bc09440219bee915e0 100644 (file)
--- a/cde/programs/dtlogin/pam_svc.c
+++ b/cde/programs/dtlogin/pam_svc.c
@@ -150,7 +150,7 @@ PamAuthenticate ( char*   prog_name,
            return(PAM_AUTH_ERR);
         }
 
-#ifdef sun        
+#ifdef legacysun
         /* Solaris BSM Audit trail */
 
        audit_login_save_host(display_name);
@@ -167,7 +167,7 @@ PamAuthenticate ( char*   prog_name,
            status = pam_authenticate( pamh, 0 );
           pam_auth_trys++;
 
-#ifdef sun              
+#ifdef legacysun
           pwd = getpwnam(user);
           audit_login_save_pw(pwd);
 
@@ -262,7 +262,7 @@ PamAccounting( char*   prog_name,
                     Debug("PamAccounting: USER_PROCESS open_session error=%d\n",
                                                                 status); 
                }
-#ifdef sun
+#ifdef legacysun
                if (status == PAM_SUCCESS) audit_login_success();
 #endif
                session_type = SOLARIS_LOGIN;
@@ -450,7 +450,7 @@ login_conv(int num_msg, struct pam_message **msg,
                     if (saved_user_passwd != NULL) {
                         r->resp = (char *) malloc(strlen(saved_user_passwd)+1);
                         if (r->resp == NULL) {
-                           __pam_free_resp(num_msg, *response);
+                         /* __pam_free_resp(num_msg, *response); */
                             *response = NULL;
                             return (PAM_CONV_ERR);
                         }

diff --git a/cde/programs/dtlogin/sysauth.c b/cde/programs/dtlogin/sysauth.c
index b63891047b23fdf08466049d81fe61c07327836d..d6280da580e819bc3a045faa7a56eb3c81b8613b 100644 (file)
--- a/cde/programs/dtlogin/sysauth.c
+++ b/cde/programs/dtlogin/sysauth.c
@@ -1430,7 +1430,7 @@ Authenticate( struct display *d, char *name, char *passwd, char **msg )
         case PAM_SUCCESS:
             return(VF_OK);
 
-        case PAM_AUTHTOKEN_REQD:
+        case PAM_NEW_AUTHTOK_REQD:
            return(VF_PASSWD_AGED);
 
        default:

diff --git a/cde/programs/dtmail/MotifApp/SelectFileCmd.C b/cde/programs/dtmail/MotifApp/SelectFileCmd.C
index d67ff94a4283c3d1d8d43539ad801101dfe4ad2c..84678781473ee5636d74a33514c19ceeb1f99b8d 100644 (file)
--- a/cde/programs/dtmail/MotifApp/SelectFileCmd.C
+++ b/cde/programs/dtmail/MotifApp/SelectFileCmd.C
@@ -88,7 +88,7 @@ extern XtPointer _XmStringUngenerate (
 }
 
 
-extern int forceUpdate( Widget );
+extern void forceUpdate( Widget );
 
 SelectFileCmd::SelectFileCmd (const char * name, 
                              const char * label,

diff --git a/cde/programs/dtmail/dtmail/DmxUtils.C b/cde/programs/dtmail/dtmail/DmxUtils.C
index c283d78ab15c875d517daf7ff64d4b32a0e15012..b61305b3d486b9b4e8edf09e38e6105dcff8bda6 100644 (file)
--- a/cde/programs/dtmail/dtmail/DmxUtils.C
+++ b/cde/programs/dtmail/dtmail/DmxUtils.C
@@ -201,16 +201,16 @@ dispname(const char *hdr)
 
        if (hdr == 0)
                return 0;
-       if (((cp = strchr(hdr, '<')) != 0) && (cp > hdr)) {
+       if (((cp = const_cast <char *> (strchr(hdr, '<'))) != 0) && (cp > hdr)) {
                *cp = 0;
-               if ((*hdr == '"') && ((cp = strrchr(++hdr, '"')) != 0))
+               if ((*hdr == '"') && ((cp = const_cast <char *> (strrchr(++hdr, '"'))) != 0))
                        *cp = 0;
                return (char *)hdr;
-       } else if ((cp = strchr(hdr, '(')) != 0) {
+       } else if ((cp = const_cast <char *> (strchr(hdr, '('))) != 0) {
                hdr = ++cp;
-               if ((cp = strchr(hdr, '+')) != 0)
+               if ((cp = const_cast <char *> (strchr(hdr, '+'))) != 0)
                        *cp = 0;
-               if ((cp = strrchr(hdr, ')')) != 0)
+               if ((cp = const_cast <char *> (strrchr(hdr, ')'))) != 0)
                        *cp = 0;
                return (char *)hdr;
        }

diff --git a/cde/programs/dtmail/dtmail/FindDialog.C b/cde/programs/dtmail/dtmail/FindDialog.C
index ad4169c65fa51a5e50b1441d4344a028ea96c20a..e8f9cf4f0f2f95b4790b9f168b6cdb5e035a0501 100644 (file)
--- a/cde/programs/dtmail/dtmail/FindDialog.C
+++ b/cde/programs/dtmail/dtmail/FindDialog.C
@@ -728,7 +728,7 @@ FindDialog::compareMessage(DtMailMessageHandle        handle)
   return(found);
 }
 
-#if !defined(CSRG_BASED) && !defined(linux)
+#if !defined(CSRG_BASED) && !defined(linux) && !defined(sun)
 //
 // See if string 'toFind' is anyware in string 'str'.
 // A case-insensitive version of strstr().

diff --git a/cde/programs/dtmail/dtmail/RoamApp.C b/cde/programs/dtmail/dtmail/RoamApp.C
index e7213e23098fc0ac5e3ba0775d8f6bd17a4c83bb..354d6c6da18ecbbc97d341c98044814bb1642c89 100644 (file)
--- a/cde/programs/dtmail/dtmail/RoamApp.C
+++ b/cde/programs/dtmail/dtmail/RoamApp.C
@@ -957,6 +957,12 @@ Usage(char *progname)
 
 nl_catd DT_catd = (nl_catd) -1;    // catgets file descriptor
 
+#if defined(reallyoldsun) || defined(USL)
+#define SA_HANDLER_TYPE void (*)(void)
+#else
+#define SA_HANDLER_TYPE void (*)(int)
+#endif
+
 void RoamApp::initialize(int *argcp, char **argv)
 {
     char               **av = argv;
@@ -991,11 +997,7 @@ void RoamApp::initialize(int *argcp, char **argv)
 
     action = &action_buf;
     memset((void*) action, 0, sizeof(struct sigaction));
-#ifdef USL
-    action->sa_handler = (void (*)())panicQuitSignalHandler;
-#else
-    action->sa_handler = panicQuitSignalHandler;
-#endif
+    action->sa_handler = (SA_HANDLER_TYPE) panicQuitSignalHandler;
     action->sa_flags = 0;
     sigaction(SIGHUP, action, NULL);
     sigaction(SIGINT, action, NULL);

diff --git a/cde/programs/dtmail/dtmail/RoamCmds.C b/cde/programs/dtmail/dtmail/RoamCmds.C
index 46d130f9aaa0d39f3d624d7abf0b970e46293f66..7efe96921dcdfdaf9335cd82942ba72001f39bd8 100644 (file)
--- a/cde/programs/dtmail/dtmail/RoamCmds.C
+++ b/cde/programs/dtmail/dtmail/RoamCmds.C
@@ -143,7 +143,7 @@ extern XtPointer _XmStringUngenerate (
 #include <sys/file.h>
 
 
-extern int forceUpdate( Widget );
+extern void forceUpdate( Widget );
 
 RoamCmd::RoamCmd
 (char *name, char *label, int active, RoamMenuWindow *window)

diff --git a/cde/programs/dtmail/dtmail/RoamInterruptibleCmd.C b/cde/programs/dtmail/dtmail/RoamInterruptibleCmd.C
index 81177c182812c1fa671e39d097185240d9a801b1..07ee31d247495a44e2956679c15f6829034aca21 100644 (file)
--- a/cde/programs/dtmail/dtmail/RoamInterruptibleCmd.C
+++ b/cde/programs/dtmail/dtmail/RoamInterruptibleCmd.C
@@ -48,7 +48,7 @@
 #include <Xm/Xm.h>
 #include <Xm/MessageB.h>
 #include <assert.h>
-extern int forceUpdate( Widget );
+extern void forceUpdate( Widget );
 
 
 RoamInterruptibleCmd::RoamInterruptibleCmd ( char *name, 

diff --git a/cde/programs/dtmail/dtmailpr/utils.C b/cde/programs/dtmail/dtmailpr/utils.C
index 2246321c72af525ef24f6de938cbc8c7a421aa94..86cd8301085ca9abf7523f5b9861978ab1cb0b9d 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/utils.C
+++ b/cde/programs/dtmail/dtmailpr/utils.C
@@ -190,16 +190,16 @@ dispname(const char *hdr)
 
        if (hdr == 0)
                return 0;
-       if (((cp = strchr(hdr, '<')) != 0) && (cp > hdr)) {
+       if (((cp = const_cast <char *> (strchr(hdr, '<'))) != 0) && (cp > hdr)) {
                *cp = 0;
-               if ((*hdr == '"') && ((cp = strrchr(++hdr, '"')) != 0))
+               if ((*hdr == '"') && ((cp = const_cast <char *> (strrchr(++hdr, '"'))) != 0))
                        *cp = 0;
                return (char *)hdr;
-       } else if ((cp = strchr(hdr, '(')) != 0) {
+       } else if ((cp = const_cast <char *> (strchr(hdr, '('))) != 0) {
                hdr = ++cp;
-               if ((cp = strchr(hdr, '+')) != 0)
+               if ((cp = const_cast <char *> (strchr(hdr, '+'))) != 0)
                        *cp = 0;
-               if ((cp = strrchr(hdr, ')')) != 0)
+               if ((cp = const_cast <char *> (strrchr(hdr, ')'))) != 0)
                        *cp = 0;
                return (char *)hdr;
        }

diff --git a/cde/programs/dtmail/include/DtMail/Buffer.hh b/cde/programs/dtmail/include/DtMail/Buffer.hh
index 0d6c68cdb82b534e577525bb3a661d12cfff2835..54efac52cf33d1acbc773a20568ae2fc77b306b4 100644 (file)
--- a/cde/programs/dtmail/include/DtMail/Buffer.hh
+++ b/cde/programs/dtmail/include/DtMail/Buffer.hh
@@ -103,7 +103,7 @@ class BufferMemory : public Buffer {
        virtual int getSize(void);      // get total size of the buffer
 
     private:
-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
        class Chunk;
 #endif
 

diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C
index 7cde4ca2b3d312b51f1ed6fdbfc337697d700269..887bdab930aff102d84dfb5308bd73c5cd9eae70 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C
+++ b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C
@@ -160,7 +160,7 @@ DtMailServer::set_password(char *password)
 //
 //     len     - Length of message.
 //
-#if defined(sun) || defined(USL)
+#if defined(reallyoldsun) || defined(USL)
 #define SA_HANDLER_TYPE void (*)(void)
 #else
 #define SA_HANDLER_TYPE void (*)(int)
@@ -231,7 +231,7 @@ DtMailServer::ptrans_retrieve_readandappend(
        // Determine if we are done with this message.
         if (proto_is_delimited())
        {
-           char *s = strrchr((const char *) _msgbuf, (int) '.');
+         char *s = const_cast<char *> (strrchr((const char *) _msgbuf, (int) '.'));
            
            if (s &&
                (s == _msgbuf || *(s-1) == '\n') &&

diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C
index 9086df3d0afa8086264ed0ca45da36cbd8817ed5..d42c553cff362641d31caf3cd9c9b362b8ea3ea7 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -783,7 +783,7 @@ DtMail::Session::getRelativePath(DtMailEnv & error, const char * path)
                free(old_exp);
 
                // Check to see if the path starts with the folder path.
-               char * matched_path = strstr(path, exp_name);
+               char * matched_path = const_cast<char *>(strstr(path, exp_name));
                if (matched_path == path) {
                    // Yes it does, make it a relative path to the folder dir.
                    int folder_path_length = strlen(exp_name);

diff --git a/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C
index 922a0298181f49f1377231f9d53266dd5bcca584..1e631140a3c5fd155d2b49b39ca49e0434a4b403 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C
@@ -938,9 +938,9 @@ MIMEBodyPart::csFromContentType(DtMailValueSeq &value)
       }
    } 
    // Get charset value
-   val_ptr = strstr(val, "charset=");
+   val_ptr = const_cast <char *> (strstr(val, "charset="));
    if ( val_ptr == NULL ) {
-         val_ptr = strstr(val, "CHARSET=");
+     val_ptr = const_cast <char *> (strstr(val, "CHARSET="));
    }
    if ( val_ptr == NULL ) {
          return NULL;

diff --git a/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C b/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C
index e85d9de094c4f380ae6d2670758fbe69806b8e09..74150270e31578472adfa3f15d40e4bab777f1c8 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C
+++ b/cde/programs/dtmail/libDtMail/RFC/MIMEPartial.C
@@ -122,7 +122,7 @@ getNamedValueString(const char *string, const char *name)
        results = strdup(&string[offset + nameLen + 1]);
        if (*results == '"') {
          results++;
-         stringEnd = strchr(results, '"');
+         stringEnd = const_cast <char *> (strchr(results, '"'));
          if (stringEnd != NULL) {
            *stringEnd = '\0';
          }
@@ -420,7 +420,7 @@ RFCMailBox::_assemblePartial(DtMailEnv      & error,
                //
                embHeader1StLen = (int) length;
                embHeader1St = (const char *)contents;
-               endHeader = strstr((const char *)contents, "\n\n");
+               endHeader = const_cast <char *> (strstr((const char *)contents, "\n\n"));
 
                if (endHeader != NULL) {
                  RFCEnvelope   embEnv(error,

diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
index b0be2f29f60d382b30c83f5d07c2985f23a0419e..9696424e04ffc2700bd5edcfb5d9bc97c320005e 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
@@ -4542,6 +4542,12 @@ RFCMailBox::startAutoSave(DtMailEnv & error,
        _session->removeEventRoutine(error, PollEntry, this);
 }
 
+#if defined(reallyoldsun) || defined(USL)
+#define SA_HANDLER_TYPE void (*)(void)
+#else
+#define SA_HANDLER_TYPE void (*)(int)
+#endif
+
 void
 RFCMailBox::dumpMaps(const char *str)
 {
@@ -4573,11 +4579,7 @@ RFCMailBox::dumpMaps(const char *str)
    */
   (void) sigemptyset(&sig_act.sa_mask);
   sig_act.sa_flags = 0;
-#if defined(USL)
-  sig_act.sa_handler = (void(*)())SigBusHandler;
-#else
-  sig_act.sa_handler = SigBusHandler;
-#endif /* USL */
+  sig_act.sa_handler = (SA_HANDLER_TYPE) SigBusHandler;
   sigaction(SIGBUS, &sig_act, &old_sig_act);
   sigbus_env_valid = 1;
   if (setjmp(sigbus_env) == 0) {

diff --git a/cde/programs/dtpdm/Imakefile b/cde/programs/dtpdm/Imakefile
index 23b82a99a803242430cf73b7571215525758c6e7..1c8ff0c15bcc3e989acb48f692179556796056bd 100644 (file)
--- a/cde/programs/dtpdm/Imakefile
+++ b/cde/programs/dtpdm/Imakefile
@@ -26,7 +26,7 @@ SYS_LIBRARIES = -lmsaa -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lintl -L/opt/SUNWspro/SC2.0.1 -lm -lgen -ldl -lC
+SYS_LIBRARIES = -lintl -lm -lgen -ldl -lC
 #endif
 
 PROGRAMS = dtpdm

diff --git a/cde/programs/dtprintinfo/libUI/BaseUI.h b/cde/programs/dtprintinfo/libUI/BaseUI.h
index 66e0aff5623c7f47a045a67891edcee60fc37f22..6298b352bfdc28ff0b67332ce076b3d8bc54bcb5 100644 (file)
--- a/cde/programs/dtprintinfo/libUI/BaseUI.h
+++ b/cde/programs/dtprintinfo/libUI/BaseUI.h
@@ -40,6 +40,16 @@
   #define boolean boolean_t
   #define true B_TRUE
   #define false B_FALSE
+#elif defined(sun)
+  #include <sys/types.h>
+  #define boolean boolean_t
+#if defined(__XOPEN_OR_POSIX)
+  #define true _B_TRUE
+  #define false _B_FALSE
+#else
+  #define true B_TRUE
+  #define false B_FALSE
+#endif
 #elif defined(linux)
   #define false 0
   #define true 1

diff --git a/cde/programs/dtprintinfo/objects/BaseObj.h b/cde/programs/dtprintinfo/objects/BaseObj.h
index c85cd0355b9e634f59ffd99b349409bae345c6ba..0e0ff4d80273083478ce97c5327dd2615d39eff0 100644 (file)
--- a/cde/programs/dtprintinfo/objects/BaseObj.h
+++ b/cde/programs/dtprintinfo/objects/BaseObj.h
@@ -41,6 +41,16 @@
   #define boolean boolean_t
   #define true B_TRUE
   #define false B_FALSE
+#elif defined(sun)
+  #include <sys/types.h>
+  #define boolean boolean_t
+#if defined(__XOPEN_OR_POSIX)
+  #define true _B_TRUE
+  #define false _B_FALSE
+#else
+  #define true B_TRUE
+  #define false B_FALSE
+#endif
 #elif defined(linux)
   #define false 0
   #define true 1

diff --git a/cde/programs/dtscreen/dtscreen.h b/cde/programs/dtscreen/dtscreen.h
index 8e27aae48d6dbdf981fdc3bb906ad86925b4f698..de7334a787d6d566dba1d20e687e8a7452cbacb2 100644 (file)
--- a/cde/programs/dtscreen/dtscreen.h
+++ b/cde/programs/dtscreen/dtscreen.h
@@ -111,7 +111,7 @@ struct passwd {
 #include <shadow.h>
 #define getpwnam getspnam
 #endif
-#if !(defined(_AIX) || defined(hpux))
+#if !(defined(_AIX) || defined(hpux) || defined(sun))
 # define srandom srand
 # define random rand
 # define MAXRAND (32767.0)

diff --git a/cde/programs/dtscreen/usleep.c b/cde/programs/dtscreen/usleep.c
index ca89c5286e1633894fa18067cec8851a1775de1b..08968bbdbb6e3c919285aac5f11a601c6baa2392 100644 (file)
--- a/cde/programs/dtscreen/usleep.c
+++ b/cde/programs/dtscreen/usleep.c
@@ -41,7 +41,7 @@
 
 #include "dtscreen.h"
 
-#if !defined(_AIX) && !defined(hpV4) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(_AIX) && !defined(hpV4) && !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
 int
 usleep(unsigned long usec)
 {

diff --git a/cde/programs/dtscreen/worm.c b/cde/programs/dtscreen/worm.c
index a806facc00761feef22cbbd27c4053d075dce429..acf3ebdae07c5c4859c38e73a72fb9d59ca31ad4 100644 (file)
--- a/cde/programs/dtscreen/worm.c
+++ b/cde/programs/dtscreen/worm.c
@@ -88,7 +88,7 @@ typedef struct {
     int         size[MAXCOLORS];
 }           wormstruct;
 
-#if !defined(CSRG_BASED)
+#if !defined(CSRG_BASED) && !defined(sun)
 int
 round(x)
     float       x;

diff --git a/cde/programs/dtterm/util/logger.c b/cde/programs/dtterm/util/logger.c
index dc5c8cca1a8657718d16a1fcf74e82888cdd6d32..ab2ca2811b3655f1364f43bbe3f1ac2b18667101 100644 (file)
--- a/cde/programs/dtterm/util/logger.c
+++ b/cde/programs/dtterm/util/logger.c
@@ -72,7 +72,7 @@ main(int argc, char **argv)
     }
 
     /* init data... */
-#if defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
+#if defined(USL) || defined(__uxp__) || defined(linux) || defined(sun) || defined(CSRG_BASED)
     (void) memset((void *) &myaddr_in, (int) '\0', sizeof(myaddr_in));
 #else
     (void) memset(myaddr_in, '\0', sizeof(myaddr_in));