oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

OSF1 patch

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@264 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Unknown User d91-jda
1996-02-11 23:21:10 +00:00
parent c23bb35fd8
commit 8ac52673ff
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appl/telnet/configure.in
View File

@@ -281,12 +281,18 @@ AC_CHECK_HEADERS(sys/tty.h termio.h termios.h utmpx.h sys/uio.h)
# Simple test for streamspty, based on the existance of getmsg(), alas # Simple test for streamspty, based on the existance of getmsg(), alas
# this breaks on SunOS4 which have streams but BSD-like ptys # this breaks on SunOS4 which have streams but BSD-like ptys
#
# And also something wierd has happend with dec-osf1, fallback to bsd-ptys
AC_MSG_CHECKING(for streamspty) AC_MSG_CHECKING(for streamspty)
krb_cv_sys_streamspty="no" case "`uname -sr`" in
if expr "`uname -sr`" : "SunOS 4" > /dev/null; then :; else SunOS\ 4*|OSF1*)
krb_cv_sys_streamspty=no
;;
*)
krb_cv_sys_streamspty="$ac_cv_func_getmsg" krb_cv_sys_streamspty="$ac_cv_func_getmsg"
fi ;;
esac
if test "$krb_cv_sys_streamspty" = yes; then if test "$krb_cv_sys_streamspty" = yes; then
AC_DEFINE(STREAMSPTY) AC_DEFINE(STREAMSPTY)
fi fi

13
appl/telnet/telnetd/sys_term.c
View File

@@ -374,6 +374,16 @@ static char *ptsname(int fd)
int getpty(int *ptynum) int getpty(int *ptynum)
{ {
#ifdef __osf__
int master;
int slave;
if(openpty(&master, &slave, line, 0, 0) == 0){
close(slave);
return master;
}
return -1;
#else
int p; int p;
char *cp, *p1, *p2; char *cp, *p1, *p2;
int i; int i;
@@ -495,6 +505,7 @@ int getpty(int *ptynum)
#endif /* STREAMSPTY */ #endif /* STREAMSPTY */
#endif /* OPENPTY */ #endif /* OPENPTY */
return(-1); return(-1);
#endif
} }
#ifdef LINEMODE #ifdef LINEMODE
@@ -877,7 +888,7 @@ static int my_find(int fd, char *module)
sl.sl_modlist=(struct str_mlist*)malloc(n * sizeof(struct str_mlist)); sl.sl_modlist=(struct str_mlist*)malloc(n * sizeof(struct str_mlist));
sl.sl_nmods = n; sl.sl_nmods = n;
n = ioctl(fd, I_LIST, &sl); n = ioctl(fd, I_LIST, &sl);
if(n != 0){ if(n < 0){
perror("ioctl(fd, I_LIST, n)"); perror("ioctl(fd, I_LIST, n)");
return -1; return -1;
} }