===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/terminal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/telnet/terminal.c	2003/06/03 02:56:18	1.6
--- src/usr.bin/telnet/terminal.c	2014/07/19 23:50:38	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: terminal.c,v 1.6 2003/06/03 02:56:18 millert Exp $	*/
  /*	$NetBSD: terminal.c,v 1.5 1996/02/28 21:04:17 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: terminal.c,v 1.7 2014/07/19 23:50:38 guenther Exp $	*/
  /*	$NetBSD: terminal.c,v 1.5 1996/02/28 21:04:17 thorpej Exp $	*/
  
  /*
***************
*** 37,43 ****
  
  int termdata;			/* Debugging flag */
  
- #ifdef	USE_TERMIO
  # ifndef VDISCARD
  cc_t termFlushChar;
  # endif
--- 37,42 ----
***************
*** 68,77 ****
  # ifndef VSTATUS
  cc_t termAytChar;
  # endif
- #else
- cc_t termForw2Char;
- cc_t termAytChar;
- #endif
  
  /*
   * initialize the terminal data structures.
--- 67,72 ----
***************
*** 163,171 ****
      extern int kludgelinemode;
  #endif
  
-     if (In3270)
- 	return(MODE_FLOW);
- 
      if (my_want_state_is_dont(TELOPT_ECHO))
  	mode |= MODE_ECHO;
  
--- 158,163 ----
***************
*** 201,229 ****
      int force;
  {
      int newmode;
- #ifdef ENCRYPTION
-     static int enc_passwd = 0;
- #endif
  
      newmode = getconnmode()|(force?MODE_FORCE:0);
  
      TerminalNewMode(newmode);
- 
- #ifdef  ENCRYPTION
-     if ((newmode & (MODE_ECHO|MODE_EDIT)) == MODE_EDIT) {
- 	if (my_want_state_is_will(TELOPT_ENCRYPT)
- 	    && (enc_passwd == 0) && !encrypt_output) {
- 	    encrypt_request_start(0, 0);
- 	    enc_passwd = 1;
- 	}
-     } else {
- 	if (enc_passwd) {
- 	    encrypt_request_end();
- 	    enc_passwd = 0;
- 	}
-     }
- #endif
- 
  }
  
  
--- 193,202 ----