- markus@cvs.openbsd.org 2003/09/01 18:15:50

     [readconf.c readconf.h servconf.c servconf.h ssh.c]
     remove unused kerberos code; ok henning@

1 files changed, 2 insertions, 3 deletions

diff --git a/ssh.c b/ssh.c
index 46640a857..35418f693 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.200 2003/08/13 09:07:10 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.201 2003/09/01 18:15:50 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -154,7 +154,6 @@ usage(void)
              _PATH_SSH_USER_CONFFILE);
         fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
         fprintf(stderr, "  -a          Disable authentication agent forwarding (default).\n");
-        fprintf(stderr, "  -k          Disable Kerberos ticket forwarding.\n");
         fprintf(stderr, "  -X          Enable X11 connection forwarding.\n");
         fprintf(stderr, "  -x          Disable X11 connection forwarding (default).\n");
         fprintf(stderr, "  -i file     Identity for public key authentication "
@@ -305,7 +304,7 @@ again:
                         options.forward_agent = 1;
                         break;
                 case 'k':
-                        options.kerberos_tgt_passing = 0;
+                        /* ignored for backward compatibility */
                         break;
                 case 'i':
                         if (stat(optarg, &st) < 0) {