diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | acconfig.h | 3 | ||||
-rw-r--r-- | configure.in | 7 | ||||
-rw-r--r-- | session.c | 27 |
4 files changed, 38 insertions, 6 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20001112 | ||
2 | - (bal) SCO Patch to add needed libraries for configure.in. Patch by | ||
3 | Phillips Porch <root@theporch.com> | ||
4 | - (bal) IRIX patch to adding Job Limits. Patch by Denis Parker <dcp@sgi.com> | ||
5 | |||
1 | 20001111 | 6 | 20001111 |
2 | - (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and | 7 | - (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and |
3 | packaging files | 8 | packaging files |
@@ -5,7 +10,7 @@ | |||
5 | - (djm) Fix vsprintf("%h") in bsd-snprintf.c, short int va_args are | 10 | - (djm) Fix vsprintf("%h") in bsd-snprintf.c, short int va_args are |
6 | promoted to type int. Report and fix from Dan Astoorian | 11 | promoted to type int. Report and fix from Dan Astoorian |
7 | <djast@cs.toronto.edu> | 12 | <djast@cs.toronto.edu> |
8 | - (djm) Hardware sysconfdir in RPM spec files as some RPM versions get | 13 | - (djm) Hardwire sysconfdir in RPM spec files as some RPM versions get |
9 | it wrong. Report from Bennett Todd <bet@rahul.net> | 14 | it wrong. Report from Bennett Todd <bet@rahul.net> |
10 | 15 | ||
11 | 20001110 | 16 | 20001110 |
diff --git a/acconfig.h b/acconfig.h index 1333a4537..bfbacba42 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -80,6 +80,9 @@ | |||
80 | /* Define if you want IRIX audit trails */ | 80 | /* Define if you want IRIX audit trails */ |
81 | #undef WITH_IRIX_AUDIT | 81 | #undef WITH_IRIX_AUDIT |
82 | 82 | ||
83 | /* Define if you want IRIX kernel jobs */ | ||
84 | #undef WITH_IRIX_JOBS | ||
85 | |||
83 | /* Location of random number pool */ | 86 | /* Location of random number pool */ |
84 | #undef RANDOM_POOL | 87 | #undef RANDOM_POOL |
85 | 88 | ||
diff --git a/configure.in b/configure.in index be500da20..4bbc95013 100644 --- a/configure.in +++ b/configure.in | |||
@@ -111,6 +111,7 @@ case "$host" in | |||
111 | AC_DEFINE(WITH_IRIX_ARRAY) | 111 | AC_DEFINE(WITH_IRIX_ARRAY) |
112 | AC_DEFINE(WITH_IRIX_PROJECT) | 112 | AC_DEFINE(WITH_IRIX_PROJECT) |
113 | AC_DEFINE(WITH_IRIX_AUDIT) | 113 | AC_DEFINE(WITH_IRIX_AUDIT) |
114 | AC_DEFINE(WITH_IRIX_JOBS) | ||
114 | no_libsocket=1 | 115 | no_libsocket=1 |
115 | no_libnsl=1 | 116 | no_libnsl=1 |
116 | AC_DEFINE(BROKEN_INET_NTOA) | 117 | AC_DEFINE(BROKEN_INET_NTOA) |
@@ -204,22 +205,24 @@ mips-sony-bsd|mips-sony-newsos4) | |||
204 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 205 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
205 | MANTYPE='$(CATMAN)' | 206 | MANTYPE='$(CATMAN)' |
206 | mansubdir=cat | 207 | mansubdir=cat |
207 | LIBS="$LIBS -lgen -lsocket -los -lprot -lx" | 208 | LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm" |
208 | no_dev_ptmx=1 | 209 | no_dev_ptmx=1 |
209 | RANLIB=true | 210 | RANLIB=true |
210 | AC_DEFINE(BROKEN_SYS_TERMIO_H) | 211 | AC_DEFINE(BROKEN_SYS_TERMIO_H) |
211 | rsh_path="/usr/bin/rcmd" | 212 | rsh_path="/usr/bin/rcmd" |
212 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | 213 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) |
214 | AC_DEFINE(DISABLE_SHADOW) | ||
213 | ;; | 215 | ;; |
214 | *-*-sco3.2v5*) | 216 | *-*-sco3.2v5*) |
215 | CFLAGS="$CFLAGS -I/usr/local/include" | 217 | CFLAGS="$CFLAGS -I/usr/local/include" |
216 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 218 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
217 | MANTYPE='$(CATMAN)' | 219 | MANTYPE='$(CATMAN)' |
218 | mansubdir=cat | 220 | mansubdir=cat |
219 | LIBS="$LIBS -lgen -lsocket -lprot -lx" | 221 | LIBS="$LIBS -lgen -lsocket -lprot -lx -ltinfo -lm" |
220 | no_dev_ptmx=1 | 222 | no_dev_ptmx=1 |
221 | rsh_path="/usr/bin/rcmd" | 223 | rsh_path="/usr/bin/rcmd" |
222 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | 224 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) |
225 | AC_DEFINE(DISABLE_SHADOW) | ||
223 | ;; | 226 | ;; |
224 | *-dec-osf*) | 227 | *-dec-osf*) |
225 | # This is untested | 228 | # This is untested |
@@ -55,6 +55,9 @@ RCSID("$OpenBSD: session.c,v 1.42 2000/10/27 07:32:18 markus Exp $"); | |||
55 | #ifdef WITH_IRIX_PROJECT | 55 | #ifdef WITH_IRIX_PROJECT |
56 | #include <proj.h> | 56 | #include <proj.h> |
57 | #endif /* WITH_IRIX_PROJECT */ | 57 | #endif /* WITH_IRIX_PROJECT */ |
58 | #ifdef WITH_IRIX_JOBS | ||
59 | #include <sys/resource.h> | ||
60 | #endif | ||
58 | 61 | ||
59 | #if defined(HAVE_USERSEC_H) | 62 | #if defined(HAVE_USERSEC_H) |
60 | #include <usersec.h> | 63 | #include <usersec.h> |
@@ -1014,6 +1017,14 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1014 | #ifdef WITH_IRIX_PROJECT | 1017 | #ifdef WITH_IRIX_PROJECT |
1015 | prid_t projid; | 1018 | prid_t projid; |
1016 | #endif /* WITH_IRIX_PROJECT */ | 1019 | #endif /* WITH_IRIX_PROJECT */ |
1020 | #ifdef WITH_IRIX_JOBS | ||
1021 | jid_t jid = 0; | ||
1022 | #else | ||
1023 | #ifdef WITH_IRIX_ARRAY | ||
1024 | int jid = 0; | ||
1025 | #endif /* WITH_IRIX_ARRAY */ | ||
1026 | #endif /* WITH_IRIX_JOBS */ | ||
1027 | |||
1017 | 1028 | ||
1018 | /* login(1) is only called if we execute the login shell */ | 1029 | /* login(1) is only called if we execute the login shell */ |
1019 | if (options.use_login && command != NULL) | 1030 | if (options.use_login && command != NULL) |
@@ -1086,11 +1097,21 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1086 | exit(1); | 1097 | exit(1); |
1087 | } | 1098 | } |
1088 | endgrent(); | 1099 | endgrent(); |
1100 | # ifdef WITH_IRIX_JOBS | ||
1101 | jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); | ||
1102 | if (jid == -1) { | ||
1103 | fatal("Failed to create job container: %.100s", | ||
1104 | strerror(errno)); | ||
1105 | } | ||
1106 | # endif /* WITH_IRIX_JOBS */ | ||
1107 | |||
1089 | # ifdef WITH_IRIX_ARRAY | 1108 | # ifdef WITH_IRIX_ARRAY |
1090 | /* initialize array session */ | 1109 | /* initialize array session */ |
1091 | if (newarraysess() != 0) | 1110 | if (jid == 0) { |
1092 | fatal("Failed to set up new array session: %.100s", | 1111 | if (newarraysess() != 0) |
1093 | strerror(errno)); | 1112 | fatal("Failed to set up new array session: %.100s", |
1113 | strerror(errno)); | ||
1114 | } | ||
1094 | # endif /* WITH_IRIX_ARRAY */ | 1115 | # endif /* WITH_IRIX_ARRAY */ |
1095 | # ifdef WITH_IRIX_PROJECT | 1116 | # ifdef WITH_IRIX_PROJECT |
1096 | /* initialize irix project info */ | 1117 | /* initialize irix project info */ |