Remove Unixware and openserver support

cde/programs/dtsession/Imakefile

@@ -44,10 +44,6 @@ EXTRA_OBJS = $(ALTDIRECTORY)SmMigResources.o
 #endif
 #endif
 
-#if defined(SCOArchitecture)
-SYS_LIBRARIES = -lcrypt -lm
-#endif
-
 #if defined(SunArchitecture)
 EXTRA_SRC = OWsync.c
 EXTRA_OBJS = $(ALTDIRECTORY)OWsync.o
@@ -55,16 +51,6 @@ EXTRA_DEFINES = -D${PROGRAMS}
 SYS_LIBRARIES = -lelf -lm -ldl
 #endif
 
-#if defined(USLArchitecture)
-/* not needed for archive. usl shared libs must resolve every
- * reference whether used or not.
- */
-SYS_LIBRARIES = -lelf -lm -ldl -lgen -liaf
-PROTO_DEFINES =
-DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-          -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
-#endif
-
 #if defined(LinuxArchitecture)
 EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT
 SYS_LIBRARIES = $(XINLIB) $(TIRPCLIB) -lXss -ldl -lcrypt -lm

cde/programs/dtsession/SmConMgmt.c

@@ -163,7 +163,7 @@ GetMemoryUtilization(void)
 #if !defined(linux)
     static int init = 0;
     static int kmem;
-#if !defined(SVR4) && !defined(sco) && !defined(hpV4) && !defined(_POWER) && !defined (__osf__) && !defined(CSRG_BASED)
+#if !defined(SVR4) && !defined(hpV4) && !defined(_POWER) && !defined (__osf__) && !defined(CSRG_BASED)
     extern void nlist();
 #endif
     int i;

cde/programs/dtsession/SmLock.c

@@ -74,14 +74,8 @@
 #include <Dt/Indicator.h>
 #include <Tt/tttk.h>
 #ifdef SVR4
-# ifdef USL
-#  include <iaf.h>
-#  include <sys/types.h>
-#  include <ia.h>
-# else
 #  include <shadow.h>
 #endif
-#endif
 
 #if defined(linux)
 # include <shadow.h>
@@ -1770,12 +1764,7 @@ localAuthenticate(
 
 
 #ifdef SVR4
-# ifdef USL
-    uinfo_t uinfo;
-    char *upasswd, *newname = NULL;
-# else
     struct spwd *sp=NULL;
-# endif
 #endif
 
     if(smGD.secureSystem)
@@ -1792,20 +1781,12 @@ localAuthenticate(
       pwent = getpwuid(uid);
       if (pwent != NULL) 
       {
-# ifdef USL
-	name = newname = strdup(pwent->pw_name);
-# else
         name = pwent->pw_name;
-#endif
       }
     }
 
     if (name == NULL ||
-# ifdef USL
-	ia_openinfo(name, &uinfo)
-# else
 	(sp = getspnam(name)) == NULL
-# endif
 	)
     {
      /*
@@ -1835,18 +1816,11 @@ localAuthenticate(
 
     if (done == False)
     {
-#ifdef USL
-	ia_get_logpwd(uinfo, &upasswd);
-#endif
       if (
           pwent->pw_passwd == NULL 
           || pwent->pw_passwd[0] == '*'
 #ifdef SVR4
-# ifdef USL
-	  || upasswd == NULL
-# else
           || sp == NULL
-# endif
 #endif
           )
       {
@@ -1877,11 +1851,7 @@ localAuthenticate(
       * Check password.
       */
 #ifdef SVR4
-# ifdef USL
-      if (strcmp(crypt(passwd, upasswd), upasswd) != 0)
-# else
       if (strcmp(crypt(passwd,sp->sp_pwdp),sp->sp_pwdp) != 0)
-# endif
 #else
       if (strcmp(pwent->pw_passwd, crypt(passwd, pwent->pw_passwd)) != 0)
 #endif
@@ -1896,12 +1866,7 @@ localAuthenticate(
 
     endpwent();
 #ifdef SVR4
-# ifdef USL
-    ia_closeinfo(uinfo);
-    if (newname) free(newname);
-# else
     endspent();
-# endif
 #endif
 
     return(rc);

cde/programs/dtsession/SmRestore.c

@@ -4836,7 +4836,7 @@ MarkFileDescriptors (
 #ifdef _SUN_OS
 		open_max = NOFILE;
 #else
-#if defined(USL) || defined(_AIX)
+#if defined(_AIX)
 		open_max = FOPEN_MAX;
 #else
 		open_max = FD_SETSIZE;

cde/programs/dtsession/SmUI.c

@@ -1161,7 +1161,7 @@ ImmediateExit(
      * Turn off SIGTERM so we don't catch one in the middle of shutting
      * down
      */
-#if !defined(SVR4) && !defined(sco)
+#if !defined(SVR4)
     old = sigblock(sigmask(SIGTERM));
     sigblock(sigmask(SIGHUP));
     sigblock(sigmask(SIGPIPE));