summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-08-29 14:30:37 +1100
committerDamien Miller <djm@mindrot.org>2000-08-29 14:30:37 +1100
commite5192fafbfbc49afaa64c7b9f3c8d90efe2f1297 (patch)
tree865a8be1325fd1881b13f3e570d288d406484756
parent6d8c11f627d75f5e48dfcb23c0fe9e65a7b522eb (diff)
- (djm) NeXT tweaks from Ben Lindstrom <mouring@pconline.com>
-rw-r--r--ChangeLog1
-rw-r--r--TODO4
-rw-r--r--configure.in8
-rw-r--r--loginrec.c15
-rw-r--r--next-posix.c19
5 files changed, 12 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 558600b3..06f412a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
Garrick James <garrick@james.net>
- (djm) Check for SCO pty naming style (ptyp%d/ttyp%d). Based on fix from
Bastian Trompetter <btrompetter@firemail.de>
+ - (djm) NeXT tweaks from Ben Lindstrom <mouring@pconline.com>
- More OpenBSD updates:
- deraadt@cvs.openbsd.org 2000/08/24 15:46:59
[scp.c]
diff --git a/TODO b/TODO
index ecfd21e3..93d8998b 100644
--- a/TODO
+++ b/TODO
@@ -9,10 +9,6 @@
- Cleanup configure.in
-- Next now has sigaction() based on sigvec(). But it sill does not
- seem to act correctly. Ctrl-C and Ctrl-Z don't return echo to the
- underlying shell.
-
- utmp/wtmp logging does not work on NeXT
- Complete Tru64 SIA support
diff --git a/configure.in b/configure.in
index 824ff5c0..b7f216bb 100644
--- a/configure.in
+++ b/configure.in
@@ -122,15 +122,13 @@ case "$host" in
need_dash_r=1
;;
*-next-*)
- # hardwire lastlog location (can't detect it on some versions)
conf_lastlog_location="/usr/adm/lastlog"
- conf_utmp_location=/etc/utmp
+ conf_utmp_location=/etc/utmp
+ conf_wtmp_location=/usr/adm/wtmp
+ MAIL=/usr/spool/mail
AC_DEFINE(HAVE_NEXT)
CFLAGS="$CFLAGS -I/usr/local/include"
- MAIL=/usr/spool/mail
AC_MSG_WARN([*** Tested: PA-RISC/m68k Untested: Sparc/Intel])
- AC_MSG_WARN([*** Expect 'scp' to fail!])
- AC_MSG_WARN([*** Please report any problems, thanks])
;;
*-*-solaris*)
CFLAGS="$CFLAGS -I/usr/local/include"
diff --git a/loginrec.c b/loginrec.c
index 2c6330a0..61bceb18 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -132,25 +132,26 @@
/**
** TODO:
- ** homegrown ttyslot()q
+ ** homegrown ttyslot()
** test, test, test
**
** Platform status:
** ----------------
**
** Known good:
- ** Linux (Redhat 6.2, need more variants)
+ ** Linux (Redhat 6.2, Debian)
+ ** Solaris
** HP-UX 10.20 (gcc only)
** IRIX
+ ** NeXT - M68k/HPPA (4.2/3.3)
**
** Testing required: Please send reports!
- ** Solaris
** NetBSD
** HP-UX 11
** AIX
**
** Platforms with known problems:
- ** NeXT
+ ** Some variants of Slackware Linux
**
**/
@@ -160,7 +161,7 @@
#include "xmalloc.h"
#include "loginrec.h"
-RCSID("$Id: loginrec.c,v 1.21 2000/08/18 04:08:38 djm Exp $");
+RCSID("$Id: loginrec.c,v 1.22 2000/08/29 03:30:37 djm Exp $");
/**
** prototypes for helper functions in this file
@@ -724,7 +725,7 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
/* FIXME: (ATL) ttyslot() needs local implementation */
-#if defined(SUNOS4) && defined(HAVE_GETTTYENT)
+#if defined(HAVE_GETTTYENT)
register struct ttyent *ty;
tty=0;
@@ -745,7 +746,7 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
tty = ttyslot(); /* seems only to work for /dev/ttyp? style names */
-#endif /* SUNOS4 && HAVE_GETTTYENT */
+#endif /* HAVE_GETTTYENT */
if (tty > 0 && (fd = open(UTMP_FILE, O_RDWR|O_CREAT, 0644)) >= 0) {
(void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
diff --git a/next-posix.c b/next-posix.c
index 0ca241fd..0f0c0ea4 100644
--- a/next-posix.c
+++ b/next-posix.c
@@ -1,26 +1,7 @@
#include "config.h"
#ifdef HAVE_NEXT
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <errno.h>
-#include <unistd.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <sys/fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <termios.h>
-#include <sys/wait.h>
-
-#include "xmalloc.h"
-#include "ssh.h"
#include "next-posix.h"
int