Remove AIXV3, SCO, Unixware, OS/2 support

Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

3 files changed, 14 insertions, 79 deletions

diff --git a/xdm/dm.c b/xdm/dm.c
index 8a7aebc..6260324 100644
--- a/xdm/dm.c
+++ b/xdm/dm.c
@@ -54,9 +54,6 @@ from The Open Group.
 #ifdef __NetBSD__
 # include <sys/param.h>
 #endif
-#ifdef USESECUREWARE
-# include <prot.h>
-#endif
 
 #ifndef sigmask
 # define sigmask(m)  (1 << ((m - 1)))
@@ -138,10 +135,6 @@ main (int argc, char **argv)
     }
 #endif
 
-#ifdef USESECUREWARE
-    set_auth_parameters (argc, argv);
-#endif
-
     /*
      * Step 1 - load configuration parameters
      */
diff --git a/xdm/resource.c b/xdm/resource.c
index 83901a2..316ace4 100644
--- a/xdm/resource.c
+++ b/xdm/resource.c
@@ -128,12 +128,8 @@ int	choiceTimeout;	/* chooser choice timeout */
 #ifndef DEF_RANDOM_FILE
 # define DEF_RANDOM_FILE "/dev/mem"
 #endif
-#ifdef __SCO__
-# define DEF_PRNGD_SOCKET "/etc/egd-pool"
-#else
-# ifndef DEF_PRNGD_SOCKET
-#  define DEF_PRNGD_SOCKET "/tmp/entropy"
-# endif
+#ifndef DEF_PRNGD_SOCKET
+# define DEF_PRNGD_SOCKET "/tmp/entropy"
 #endif
 #ifndef DEF_PRNGD_PORT
 # define DEF_PRNGD_PORT "0"
diff --git a/xdm/session.c b/xdm/session.c
index 9382414..4f71d71 100644
--- a/xdm/session.c
+++ b/xdm/session.c
@@ -50,9 +50,6 @@ from The Open Group.
 #include <stdio.h>
 #include <ctype.h>
 #include <grp.h>	/* for initgroups */
-#ifdef AIXV3
-# include <usersec.h>
-#endif
 
 #ifndef USE_PAM        /* PAM modules should handle these */
 # ifdef SECURE_RPC
@@ -67,10 +64,6 @@ extern int key_setnet(struct key_netstarg *arg);
 # endif
 #endif /* USE_PAM */
 
-#ifdef __SCO__
-# include <prot.h>
-#endif
-
 #ifdef USE_SELINUX
 #include <selinux/selinux.h>
 #include <selinux/get_context_list.h>
@@ -141,7 +134,7 @@ extern	struct spwd	*getspnam(GETSPNAM_ARGS);
 extern	void	endspent(void);
 # endif
 #endif
-#if defined(CSRG_BASED) || defined(__GLIBC__) || defined(__UNIXWARE__) || defined(__SCO__)
+#if defined(CSRG_BASED) || defined(__GLIBC__)
 # include <pwd.h>
 # include <unistd.h>
 #else
@@ -594,11 +587,6 @@ StartClient (
     pam_handle_t *pamh = thepamh ();
     int	pam_error;
 #endif
-#ifdef USESECUREWARE
-    char *reason, **smpenv, *smpshell;
-    int ret;
-    extern struct smp_user_info *userp;
-#endif
 
     if (verify->argv) {
 	Debug ("StartSession %s: ", verify->argv[0]);
@@ -624,60 +612,29 @@ StartClient (
 
 	/* Do system-dependent login setup here */
 
-#ifdef USESECUREWARE
-        Debug ("set_identity: uid=%d\n", userp->pw.pw_uid);
-        ret = smp_set_identity (userp, &reason, &smpenv, &smpshell);
-        Debug ("smp_set_identity returns %d luid=%d\n", ret, getluid());
-        switch (ret) {
-          case SMP_FAIL:
-            LogError ("Unable to set identity\n");
-            smp_audit_fail (userp, 0);
-            return 0;
-          case SMP_EXTFAIL:
-            LogError ("Unable to set identity: %s\n", reason);
-            smp_audit_fail (userp, 0);
-            return 0;
-          case SMP_NOTAUTH:
-            LogError ("Authorization failed\n");
-            smp_audit_fail (userp, 0);
-            return 0;
-          case SMP_ACCTLOCK:
-            LogError ("Account is locked\n");
-            smp_audit_fail (userp, 0);
-            return 0;
-          case SMP_COMPLETE:
-            break;
-          default:
-            LogError ("Unhandled identity error %d\n", ret);
-            smp_audit_fail (userp, 0);
-            return 0;
-        }
-#endif
-
-#ifndef AIXV3
-# ifndef HAVE_SETUSERCONTEXT
+#ifndef HAVE_SETUSERCONTEXT
 	if (setgid (verify->gid) < 0) {
 	    LogError ("setgid %d (user \"%s\") failed: %s\n",
 		      verify->gid, name, _SysErrorMsg (errno));
 	    return (0);
 	}
-#  if defined(BSD) && (BSD >= 199103)
+# if defined(BSD) && (BSD >= 199103)
 	if (setlogin (name) < 0) {
 	    LogError ("setlogin for \"%s\" failed: %s\n",
 		      name, _SysErrorMsg (errno));
 	    return (0);
 	}
-#  endif
-#  ifndef QNX4
+# endif
+# ifndef QNX4
 	if (initgroups (name, verify->gid) < 0) {
 	    LogError ("initgroups for \"%s\" failed: %s\n",
 		      name, _SysErrorMsg (errno));
 	    return (0);
 	}
-#  endif   /* QNX4 doesn't support multi-groups, no initgroups() */
-# endif /* !HAVE_SETUSERCONTEXT */
+# endif   /* QNX4 doesn't support multi-groups, no initgroups() */
+#endif /* !HAVE_SETUSERCONTEXT */
 
-# ifdef USE_PAM
+#ifdef USE_PAM
 	if (pamh) {
 	    long i;
 	    char **pam_env;
@@ -696,15 +653,15 @@ StartClient (
 	    }
 
 	}
-# endif
+#endif
 
-# ifndef HAVE_SETUSERCONTEXT
+#ifndef HAVE_SETUSERCONTEXT
 	if (setuid(verify->uid) < 0) {
 	    LogError ("setuid %d (user \"%s\") failed: %s\n",
 		      verify->uid, name, _SysErrorMsg (errno));
 	    return (0);
 	}
-# else /* HAVE_SETUSERCONTEXT */
+#else /* HAVE_SETUSERCONTEXT */
 	/*
 	 * Set the user's credentials: uid, gid, groups,
 	 * environment variables, resource limits, and umask.
@@ -722,18 +679,7 @@ StartClient (
 		      name, _SysErrorMsg (errno));
 	    return (0);
 	}
-# endif /* HAVE_SETUSERCONTEXT */
-#else /* AIXV3 */
-	/*
-	 * Set the user's credentials: uid, gid, groups,
-	 * audit classes, user limits, and umask.
-	 */
-	if (setpcred(name, NULL) == -1) {
-	    LogError ("setpcred for \"%s\" failed: %s\n",
-		      name, _SysErrorMsg (errno));
-	    return (0);
-	}
-#endif /* AIXV3 */
+#endif /* HAVE_SETUSERCONTEXT */
 
 #ifndef USE_PAM		/* PAM modules should handle these */
 	/*