summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
Diffstat (limited to 'session.c')
-rw-r--r--session.c56
1 files changed, 3 insertions, 53 deletions
diff --git a/session.c b/session.c
index f9f5da80e..e48c3c0b4 100644
--- a/session.c
+++ b/session.c
@@ -57,16 +57,6 @@ RCSID("$OpenBSD: session.c,v 1.126 2002/02/14 23:28:00 markus Exp $");
57#include "canohost.h" 57#include "canohost.h"
58#include "session.h" 58#include "session.h"
59 59
60#ifdef WITH_IRIX_PROJECT
61#include <proj.h>
62#endif /* WITH_IRIX_PROJECT */
63#ifdef WITH_IRIX_JOBS
64#include <sys/resource.h>
65#endif
66#ifdef WITH_IRIX_AUDIT
67#include <sat.h>
68#endif /* WITH_IRIX_AUDIT */
69
70#if defined(HAVE_USERSEC_H) 60#if defined(HAVE_USERSEC_H)
71#include <usersec.h> 61#include <usersec.h>
72#endif 62#endif
@@ -1006,16 +996,6 @@ do_child(Session *s, const char *command)
1006 struct stat st; 996 struct stat st;
1007 char *argv[10]; 997 char *argv[10];
1008 int do_xauth; 998 int do_xauth;
1009#ifdef WITH_IRIX_PROJECT
1010 prid_t projid;
1011#endif /* WITH_IRIX_PROJECT */
1012#ifdef WITH_IRIX_JOBS
1013 jid_t jid = 0;
1014#else
1015#ifdef WITH_IRIX_ARRAY
1016 int jid = 0;
1017#endif /* WITH_IRIX_ARRAY */
1018#endif /* WITH_IRIX_JOBS */
1019 999
1020 do_xauth = 1000 do_xauth =
1021 s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL; 1001 s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL;
@@ -1098,39 +1078,9 @@ do_child(Session *s, const char *command)
1098 */ 1078 */
1099 do_pam_setcred(0); 1079 do_pam_setcred(0);
1100# endif /* USE_PAM */ 1080# endif /* USE_PAM */
1101# ifdef WITH_IRIX_JOBS 1081# if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
1102 jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); 1082 irix_setusercontext(pw);
1103 if (jid == -1) { 1083# endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */
1104 fatal("Failed to create job container: %.100s",
1105 strerror(errno));
1106 }
1107# endif /* WITH_IRIX_JOBS */
1108# ifdef WITH_IRIX_ARRAY
1109 /* initialize array session */
1110 if (jid == 0) {
1111 if (newarraysess() != 0)
1112 fatal("Failed to set up new array session: %.100s",
1113 strerror(errno));
1114 }
1115# endif /* WITH_IRIX_ARRAY */
1116# ifdef WITH_IRIX_PROJECT
1117 /* initialize irix project info */
1118 if ((projid = getdfltprojuser(pw->pw_name)) == -1) {
1119 debug("Failed to get project id, using projid 0");
1120 projid = 0;
1121 }
1122 if (setprid(projid))
1123 fatal("Failed to initialize project %d for %s: %.100s",
1124 (int)projid, pw->pw_name, strerror(errno));
1125# endif /* WITH_IRIX_PROJECT */
1126#ifdef WITH_IRIX_AUDIT
1127 if (sysconf(_SC_AUDIT)) {
1128 debug("Setting sat id to %d", (int) pw->pw_uid);
1129 if (satsetid(pw->pw_uid))
1130 debug("error setting satid: %.100s", strerror(errno));
1131 }
1132#endif /* WITH_IRIX_AUDIT */
1133
1134#ifdef _AIX 1084#ifdef _AIX
1135 /* 1085 /*
1136 * AIX has a "usrinfo" area where logname and 1086 * AIX has a "usrinfo" area where logname and