*** ext.h	Fri Nov 24 01:43:21 1995
--- /usr/local/src/mtr/tjh/SSLtelnet/src/telnetd/ext.h	Thu Dec 21 15:28:34 1995
***************
*** 1,6 ****
  /*
!  * Copyright (c) 1989, 1993
!  *	The Regents of the University of California.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
--- 1,6 ----
  /*
!  * Copyright (c) 1989 The Regents of the University of California.
!  * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
***************
*** 30,40 ****
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	@(#)ext.h	8.2 (Berkeley) 12/15/93
   */
  
- /* 	$Id: ext.h,v 1.4 1995/11/23 15:43:21 martin Exp $	 */
- 
  /*
   * Telnet server variable declarations
   */
--- 30,38 ----
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   *
!  *	@(#)ext.h	5.7 (Berkeley) 3/1/91
   */
  
  /*
   * Telnet server variable declarations
   */
***************
*** 52,58 ****
  # endif	/* KLUDGELINEMODE */
  #endif	/* LINEMODE */
  extern int	flowmode;	/* current flow control state */
- extern int	restartany;	/* restart output on any character state */
  #ifdef DIAGNOSTICS
  extern int	diagnostic;	/* telnet diagnostic capabilities */
  #endif /* DIAGNOSTICS */
--- 50,55 ----
***************
*** 62,74 ****
  #if	defined(SecurID)
  extern int	require_SecurID;
  #endif
! #if	defined(AUTHENTICATION)
  extern int	auth_level;
  #endif
  
  extern slcfun	slctab[NSLC + 1];	/* slc mapping table */
  
! char	*terminaltype;
  
  /*
   * I/O data buffers, pointers, and counters.
--- 59,71 ----
  #if	defined(SecurID)
  extern int	require_SecurID;
  #endif
! #if	defined(AUTHENTICATE)
  extern int	auth_level;
  #endif
  
  extern slcfun	slctab[NSLC + 1];	/* slc mapping table */
  
! extern char	*terminaltype;
  
  /*
   * I/O data buffers, pointers, and counters.
***************
*** 121,132 ****
  	init_termbuf P((void)),
  	interrupt P((void)),
  	localstat P((void)),
- 	flowstat P((void)),
  	netclear P((void)),
  #ifdef DIAGNOSTICS
  	printoption P((char *, int)),
  	printdata P((char *, char *, int)),
! 	printsub P((char, unsigned char *, int)),
  #endif
  	ptyflush P((void)),
  	putchr P((int)),
--- 118,129 ----
  	init_termbuf P((void)),
  	interrupt P((void)),
  	localstat P((void)),
  	netclear P((void)),
+ 	netflush P((void)),
  #ifdef DIAGNOSTICS
  	printoption P((char *, int)),
  	printdata P((char *, char *, int)),
! 	printsub P((int, unsigned char *, int)),
  #endif
  	ptyflush P((void)),
  	putchr P((int)),
***************
*** 143,152 ****
  	set_termbuf P((void)),
  	start_login P((char *, int, char *)),
  	start_slc P((int)),
! #ifdef  convex
! 	startslave P((char *)),
  #else
! 	startslave P((char *, int, char *)),
  #endif
  	suboption P((void)),
  	telrcv P((void)),
--- 140,149 ----
  	set_termbuf P((void)),
  	start_login P((char *, int, char *)),
  	start_slc P((int)),
! #if	defined(AUTHENTICATE)
! 	start_slave P((char *)),
  #else
! 	start_slave P((char *, int, char *)),
  #endif
  	suboption P((void)),
  	telrcv P((void)),
***************
*** 157,166 ****
  extern int
  	end_slc P((unsigned char **)),
  	getnpty P((void)),
! 	netflush P((void)),
! #ifndef convex
! 	getpty P((int *)),
! #endif
  	login_tty P((int)),
  	spcset P((int, cc_t *, cc_t **)),
  	stilloob P((int)),
--- 154,160 ----
  extern int
  	end_slc P((unsigned char **)),
  	getnpty P((void)),
! 	my_getpty P((void)),
  	login_tty P((int)),
  	spcset P((int, cc_t *, cc_t **)),
  	stilloob P((int)),
***************
*** 167,173 ****
  	terminit P((void)),
  	termstat P((void)),
  	tty_flowmode P((void)),
- 	tty_restartany P((void)),
  	tty_isbinaryin P((void)),
  	tty_isbinaryout P((void)),
  	tty_iscrnl P((void)),
--- 161,166 ----
***************
*** 193,203 ****
  	wontoption P((int)),
  	writenet P((unsigned char *, int));
  
! #ifdef	ENCRYPTION
  extern void	(*encrypt_output) P((unsigned char *, int));
  extern int	(*decrypt_input) P((int));
  extern char	*nclearto;
! #endif	/* ENCRYPTION */
  
  
  /*
--- 186,196 ----
  	wontoption P((int)),
  	writenet P((unsigned char *, int));
  
! #if	defined(ENCRYPT)
  extern void	(*encrypt_output) P((unsigned char *, int));
  extern int	(*decrypt_input) P((int));
  extern char	*nclearto;
! #endif
  
  
  /*
***************
*** 214,220 ****
  	ttypesubopt,		/* ttype subopt is received */
  	tspeedsubopt,		/* tspeed subopt is received */
  	environsubopt,		/* environ subopt is received */
- 	oenvironsubopt,		/* old environ subopt is received */
  	xdisplocsubopt,		/* xdisploc subopt is received */
  	baseline,		/* time started to do timed action */
  	gotDM;			/* when did we last see a data mark */
--- 207,212 ----
***************
*** 231,256 ****
   * or at least spread knowledge of the protocol --tjh
   */
  
! #ifndef	DEFAULT_IM
! # define DEFAULT_IM	"\r\n\r\n" CANONICAL_HOST " [SSL] (%h) (%t)\r\n\r\r\n\r"
  #endif
  
  #else /* USE_SSL */
  
! #ifndef	DEFAULT_IM
! # ifdef CRAY
! #  define DEFAULT_IM	"\r\n\r\nCray UNICOS (%h) (%t)\r\n\r\r\n\r"
! # else
! #  ifdef sun
! #   define DEFAULT_IM	"\r\n\r\nSunOS UNIX (%h) (%t)\r\n\r\r\n\r"
! #  else
! #   ifdef ultrix
! #    define DEFAULT_IM	"\r\n\r\nULTRIX (%h) (%t)\r\n\r\r\n\r"
! #   else
! #    define DEFAULT_IM	"\r\n\r\n4.4 BSD UNIX (%h) (%t)\r\n\r\r\n\r"
! #   endif
! #  endif
! # endif
  #endif
  
  #endif /* USE_SSL */
--- 223,264 ----
   * or at least spread knowledge of the protocol --tjh
   */
  
! #ifdef LINUX2
! #define DEFAULT_IM	"\r\n\r\nLINUX UNIX [SSL 0.7] (%h) (%t)\r\n\r\r\n\r"
! #else
! #ifdef SOLARIS2
! #define DEFAULT_IM	"\r\n\r\nUNIX [SSL 0.7] (%h) (%t)\r\n\r\r\n\r"
! #else
! #ifdef SUNOS
! #define DEFAULT_IM	"\r\n\r\nSunOS UNIX [SSL 0.7] (%h) (%t)\r\n\r\r\n\r"
! #else
! #ifdef CRAY
! #define DEFAULT_IM	"\r\n\r\nCray UNICOS [SSL 0.7] (%h) (%t)\r\n\r\r\n\r"
! #else
! #define DEFAULT_IM	"\r\n\r\nUNIX [SSL 0.7] (%h) (%t)\r\n\r\r\n\r"
  #endif
+ #endif
+ #endif
+ #endif
  
  #else /* USE_SSL */
  
! #ifdef LINUX2
! #define DEFAULT_IM	"\r\n\r\nLINUX UNIX (%h) (%t)\r\n\r\r\n\r"
! #else
! #ifdef SOLARIS2
! #define DEFAULT_IM	"\r\n\r\nUNIX (%h) (%t)\r\n\r\r\n\r"
! #else
! #ifdef SUNOS
! #define DEFAULT_IM	"\r\n\r\nSunOS UNIX (%h) (%t)\r\n\r\r\n\r"
! #else
! #ifdef CRAY
! #define DEFAULT_IM	"\r\n\r\nCray UNICOS (%h) (%t)\r\n\r\r\n\r"
! #else
! #define DEFAULT_IM	"\r\n\r\nUNIX (%h) (%t)\r\n\r\r\n\r"
! #endif
! #endif
! #endif
  #endif
  
  #endif /* USE_SSL */
