===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/telnet/main.c	1995/10/18 08:46:14	1.1
--- src/usr.bin/telnet/main.c	1996/03/27 19:33:03	1.2
***************
*** 1,6 ****
  /*
!  * Copyright (c) 1988, 1990 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,9 ----
+ /*	$OpenBSD: main.c,v 1.2 1996/03/27 19:33:03 niklas Exp $	*/
+ /*	$NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $	*/
+ 
  /*
!  * Copyright (c) 1988, 1990, 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
***************
*** 32,45 ****
   */
  
  #ifndef lint
! char copyright[] =
! "@(#) Copyright (c) 1988, 1990 Regents of the University of California.\n\
!  All rights reserved.\n";
  #endif /* not lint */
  
  #ifndef lint
! /* from: static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 12/18/92"; */
! static char *rcsid = "$Id: main.c,v 1.1 1995/10/18 08:46:14 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 35,52 ----
   */
  
  #ifndef lint
! static char copyright[] =
! "@(#) Copyright (c) 1988, 1990, 1993\n\
! 	The Regents of the University of California.  All rights reserved.\n";
  #endif /* not lint */
  
  #ifndef lint
! #if 0
! static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
! static char rcsid[] = "$NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $";
! #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.2 1996/03/27 19:33:03 niklas Exp $";
! #endif
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 50,57 ****
  
  /* These values need to be the same as defined in libtelnet/kerberos5.c */
  /* Either define them in both places, or put in some common header file. */
! #define OPTS_FORWARD_CREDS           0x00000002
! #define OPTS_FORWARDABLE_CREDS       0x00000001
  
  #if 0
  #define FORWARD
--- 57,64 ----
  
  /* These values need to be the same as defined in libtelnet/kerberos5.c */
  /* Either define them in both places, or put in some common header file. */
! #define OPTS_FORWARD_CREDS	0x00000002
! #define OPTS_FORWARDABLE_CREDS	0x00000001
  
  #if 0
  #define FORWARD
***************
*** 66,72 ****
      init_terminal();
  
      init_network();
!     
      init_telnet();
  
      init_sys();
--- 73,79 ----
      init_terminal();
  
      init_network();
! 
      init_telnet();
  
      init_sys();
***************
*** 82,98 ****
  	fprintf(stderr, "Usage: %s %s%s%s%s\n",
  	    prompt,
  #ifdef	AUTHENTICATION
! 	    " [-8] [-E] [-K] [-L] [-X atype] [-a] [-d] [-e char] [-k realm]",
! 	    "\n\t[-l user] [-f/-F] [-n tracefile] ",
  #else
! 	    " [-8] [-E] [-L] [-a] [-d] [-e char] [-l user] [-n tracefile]",
! 	    "\n\t",
  #endif
  #if defined(TN3270) && defined(unix)
  # ifdef AUTHENTICATION
! 	    "[-noasynch] [-noasynctty] [-noasyncnet]\n\t[-r] [-t transcom] ",
  # else
! 	    "[-noasynch] [-noasynctty] [-noasyncnet] [-r] [-t transcom]\n\t",
  # endif
  #else
  	    "[-r] ",
--- 89,105 ----
  	fprintf(stderr, "Usage: %s %s%s%s%s\n",
  	    prompt,
  #ifdef	AUTHENTICATION
! 	    "[-8] [-E] [-K] [-L] [-S tos] [-X atype] [-a] [-c] [-d] [-e char]",
! 	    "\n\t[-k realm] [-l user] [-f/-F] [-n tracefile] ",
  #else
! 	    "[-8] [-E] [-L] [-S tos] [-a] [-c] [-d] [-e char] [-l user]",
! 	    "\n\t[-n tracefile]",
  #endif
  #if defined(TN3270) && defined(unix)
  # ifdef AUTHENTICATION
! 	    "[-noasynch] [-noasynctty]\n\t[-noasyncnet] [-r] [-t transcom] ",
  # else
! 	    "[-noasynch] [-noasynctty] [-noasyncnet] [-r]\n\t[-t transcom]",
  # endif
  #else
  	    "[-r] ",
***************
*** 189,195 ****
  		case 'f':
  #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
  			if (forward_flags & OPTS_FORWARD_CREDS) {
! 			    fprintf(stderr, 
  				    "%s: Only one of -f and -F allowed.\n",
  				    prompt);
  			    usage();
--- 196,202 ----
  		case 'f':
  #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
  			if (forward_flags & OPTS_FORWARD_CREDS) {
! 			    fprintf(stderr,
  				    "%s: Only one of -f and -F allowed.\n",
  				    prompt);
  			    usage();
***************
*** 197,210 ****
  			forward_flags |= OPTS_FORWARD_CREDS;
  #else
  			fprintf(stderr,
! 			 "%s: Warning: -f ignored, no Kerberos V5 support.\n", 
  				prompt);
  #endif
  			break;
  		case 'F':
  #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
  			if (forward_flags & OPTS_FORWARD_CREDS) {
! 			    fprintf(stderr, 
  				    "%s: Only one of -f and -F allowed.\n",
  				    prompt);
  			    usage();
--- 204,217 ----
  			forward_flags |= OPTS_FORWARD_CREDS;
  #else
  			fprintf(stderr,
! 			 "%s: Warning: -f ignored, no Kerberos V5 support.\n",
  				prompt);
  #endif
  			break;
  		case 'F':
  #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
  			if (forward_flags & OPTS_FORWARD_CREDS) {
! 			    fprintf(stderr,
  				    "%s: Only one of -f and -F allowed.\n",
  				    prompt);
  			    usage();
***************
*** 213,219 ****
  			forward_flags |= OPTS_FORWARDABLE_CREDS;
  #else
  			fprintf(stderr,
! 			 "%s: Warning: -F ignored, no Kerberos V5 support.\n", 
  				prompt);
  #endif
  			break;
--- 220,226 ----
  			forward_flags |= OPTS_FORWARDABLE_CREDS;
  #else
  			fprintf(stderr,
! 			 "%s: Warning: -F ignored, no Kerberos V5 support.\n",
  				prompt);
  #endif
  			break;