Track style changes in Borman release of telnet

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3011 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/telnet/telnet/main.c b/src/appl/telnet/telnet/main.c
index 167deada87ba0ba3b0734fc9af5fb73bece3a6d4..57658391e33ce754c73d7dd829e1034e886e9c94 100644 (file)
--- a/src/appl/telnet/telnet/main.c
+++ b/src/appl/telnet/telnet/main.c
@@ -52,6 +52,8 @@ static char sccsid[] = "@(#)main.c    5.5 (Berkeley) 12/18/92";
 #define OPTS_FORWARD_CREDS           0x00000002
 #define OPTS_FORWARDABLE_CREDS       0x00000001
 
+#define FORWARD
+
 /*
  * Initialize variables.
  */
@@ -114,7 +116,9 @@ main(argc, argv)
        extern int optind;
        int ch;
        char *user, *strrchr();
+#ifdef FORWARD
        extern int forward_flags;
+#endif /* FORWARD */
 
        tninit();               /* Clear out things */
 #if    defined(CRAY) && !defined(__STDC__)
@@ -184,7 +188,7 @@ main(argc, argv)
                        set_escape_char(optarg);
                        break;
                case 'f':
-#if defined(AUTHENTICATION) && defined(KRB5)
+#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
                        if (forward_flags & OPTS_FORWARD_CREDS) {
                            fprintf(stderr, 
                                    "%s: Only one of -f and -F allowed.\n",
@@ -199,7 +203,7 @@ main(argc, argv)
 #endif
                        break;
                case 'F':
-#if defined(AUTHENTICATION) && defined(KRB5)
+#if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD)
                        if (forward_flags & OPTS_FORWARD_CREDS) {
                            fprintf(stderr, 
                                    "%s: Only one of -f and -F allowed.\n",