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)
- (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 70ce05524..2dd3bc6f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
1200301027
2 - (bal) Bugzilla 477 patch by wendyp@cray.com. Define TIOCGPGRP for
3 cray. Also removed test for tcgetpgrp in configure.ac since it
4 is no longer used.
5
120030124 620030124
2 - (djm) OpenBSD CVS Sync 7 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2003/01/23 08:58:47 8 - jmc@cvs.openbsd.org 2003/01/23 08:58:47
@@ -1074,4 +1079,4 @@
1074 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1079 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1075 ok provos@ 1080 ok provos@
1076 1081
1077$Id: ChangeLog,v 1.2587 2003/01/24 00:50:32 djm Exp $ 1082$Id: ChangeLog,v 1.2588 2003/01/27 21:15:10 mouring Exp $
diff --git a/configure.ac b/configure.ac
index b85f1884e..870def2ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.102 2003/01/20 04:20:25 tim Exp $ 1# $Id: configure.ac,v 1.103 2003/01/27 21:15:10 mouring Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -610,8 +610,7 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
610 setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ 610 setenv seteuid setgroups setlogin setproctitle setresgid setreuid \
611 setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ 611 setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \
612 socketpair strerror strlcat strlcpy strmode strnvis sysconf \ 612 socketpair strerror strlcat strlcpy strmode strnvis sysconf \
613 tcgetpgrp truncate utimes vhangup vsnprintf waitpid __b64_ntop \ 613 truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty)
614 _getpty)
615 614
616dnl Make sure strsep prototype is defined before defining HAVE_STRSEP 615dnl Make sure strsep prototype is defined before defining HAVE_STRSEP
617AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)]) 616AC_CHECK_DECL(strsep, [AC_CHECK_FUNCS(strsep)])
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h
index 8868b4364..9a15cb251 100644
--- a/openbsd-compat/bsd-cray.h
+++ b/openbsd-compat/bsd-cray.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * $Id: bsd-cray.h,v 1.5 2002/09/26 00:38:51 tim Exp $ 2 * $Id: bsd-cray.h,v 1.6 2003/01/27 21:15:11 mouring Exp $
3 * 3 *
4 * bsd-cray.h 4 * bsd-cray.h
5 * 5 *
@@ -49,6 +49,8 @@ extern char cray_tmpdir[]; /* cray tmpdir */
49#ifndef MAXHOSTNAMELEN 49#ifndef MAXHOSTNAMELEN
50#define MAXHOSTNAMELEN 64 50#define MAXHOSTNAMELEN 64
51#endif 51#endif
52#include <sys/ttold.h>
53#define TIOCGPGRP (tIOC|20)
52#endif 54#endif
53 55
54#endif /* _BSD_CRAY_H */ 56#endif /* _BSD_CRAY_H */