summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2003-01-27 21:15:10 +0000
committerBen Lindstrom <mouring@eviladmin.org>2003-01-27 21:15:10 +0000
commit6dc562a7aacbedbf9d2dfcef19fcba19c226b453 (patch)
tree5b314ee0fe8b251518337c1b159b8f015037f853
parent3bc0c062abf4d7a41373694ae04363579e2345e4 (diff)
downloadopenssh-git-6dc562a7aacbedbf9d2dfcef19fcba19c226b453.tar.gz
- (bal) Bugzilla 477 patch by wendyp@cray.com. Define TIOCGPGRP for
cray. Also removed test for tcgetpgrp in configure.ac since it is no longer used.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac5
-rw-r--r--openbsd-compat/bsd-cray.h4
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 70ce0552..2dd3bc6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+200301027
+ - (bal) Bugzilla 477 patch by wendyp@cray.com. Define TIOCGPGRP for
+ cray. Also removed test for tcgetpgrp in configure.ac since it
+ is no longer used.
+
20030124
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2003/01/23 08:58:47
@@ -1074,4 +1079,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2587 2003/01/24 00:50:32 djm Exp $
+$Id: ChangeLog,v 1.2588 2003/01/27 21:15:10 mouring Exp $
diff --git a/configure.ac b/configure.ac
index b85f1884..870def2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.102 2003/01/20 04:20:25 tim Exp $
+# $Id: configure.ac,v 1.103 2003/01/27 21:15:10 mouring Exp $
AC_INIT
AC_CONFIG_SRCDIR([ssh.c])
@@ -610,8 +610,7 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
setenv seteuid setgroups setlogin setproctitle setresgid setreuid \
setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \
socketpair strerror strlcat strlcpy strmode strnvis sysconf \
- tcgetpgrp truncate utimes vhangup vsnprintf waitpid __b64_ntop \
- _getpty)
+ truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty)
dnl Make sure strsep prototype is defined before defining HAVE_STRSEP
AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h
index 8868b436..9a15cb25 100644
--- a/openbsd-compat/bsd-cray.h
+++ b/openbsd-compat/bsd-cray.h
@@ -1,5 +1,5 @@
/*
- * $Id: bsd-cray.h,v 1.5 2002/09/26 00:38:51 tim Exp $
+ * $Id: bsd-cray.h,v 1.6 2003/01/27 21:15:11 mouring Exp $
*
* bsd-cray.h
*
@@ -49,6 +49,8 @@ extern char cray_tmpdir[]; /* cray tmpdir */
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 64
#endif
+#include <sys/ttold.h>
+#define TIOCGPGRP (tIOC|20)
#endif
#endif /* _BSD_CRAY_H */