diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-06 18:58:31 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-06 18:58:31 +0000 |
| commit | 8ff2a8d2c2cef0c446cf7ac9002f9045a15cbef5 (patch) | |
| tree | 20412b1c36a4804885c2bf8708c39d97d5911ed0 | |
| parent | de3895d580cd9748d48f414a81f740451b34e850 (diff) | |
- (bal) Revered out of runtime IRIX runtime detection of joblimits. Code is
incomplete.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | openbsd-compat/port-irix.c | 27 |
3 files changed, 12 insertions, 23 deletions
@@ -13,6 +13,8 @@ http://bugzilla.mindrot.org/show_bug.cgi?id=76 - (bal) Slight update to OpenSC support. Better version checking. patch by Juha Yrjölä <jyrjola@cc.hut.fi> + - (bal) Revered out of runtime IRIX detection of joblimits. Code is + incomplete. 20020405 - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by @@ -8183,4 +8185,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2030 2002/04/06 18:29:59 mouring Exp $ +$Id: ChangeLog,v 1.2031 2002/04/06 18:58:31 mouring Exp $ diff --git a/configure.ac b/configure.ac index caa747f6..2208c4a0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.32 2002/04/05 20:23:37 mouring Exp $ +# $Id: configure.ac,v 1.33 2002/04/06 18:58:32 mouring Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -114,7 +114,7 @@ case "$host" in AC_DEFINE(WITH_IRIX_ARRAY) AC_DEFINE(WITH_IRIX_PROJECT) AC_DEFINE(WITH_IRIX_AUDIT) - AC_DEFINE(WITH_IRIX_JOBS) + AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS)]) AC_DEFINE(BROKEN_INET_NTOA) ;; *-*-linux*) diff --git a/openbsd-compat/port-irix.c b/openbsd-compat/port-irix.c index bd03366f..a63ec429 100644 --- a/openbsd-compat/port-irix.c +++ b/openbsd-compat/port-irix.c @@ -3,20 +3,13 @@ #if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) #ifdef WITH_IRIX_PROJECT -# include <proj.h> +#include <proj.h> #endif /* WITH_IRIX_PROJECT */ #ifdef WITH_IRIX_JOBS -# include <sys/resource.h> -# include <optional_sym.h> -# if !defined(JLIMIT_CPU) -/* Simulate job limit support so we can still test for it at runtime. */ -typedef __int64_t jid_t; -extern jid_t jlimit_startjob(char *, uid_t, char *); -# pragma optional jlimit_startjob -# endif -#endif /* WITH_IRIX_JOBS */ +#include <sys/resource.h> +#endif #ifdef WITH_IRIX_AUDIT -# include <sat.h> +#include <sat.h> #endif /* WITH_IRIX_AUDIT */ void @@ -34,16 +27,10 @@ irix_setusercontext(struct passwd *pw) #endif /* WITH_IRIX_JOBS */ #ifdef WITH_IRIX_JOBS - if (_MIPS_SYMBOL_PRESENT(jlimit_startjob)) { - jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); - if (jid == -1) { - if (errno == ENOPKG) - jid = 0; - else - fatal("Failed to create job container: %.100s", + jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); + if (jid == -1) + fatal("Failed to create job container: %.100s", strerror(errno)); - } - } #endif /* WITH_IRIX_JOBS */ #ifdef WITH_IRIX_ARRAY /* initialize array session */ |