- (dtucker) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2003/07/22 13:35:22
     [auth1.c auth.h auth-passwd.c monitor.c monitor.h monitor_wrap.c
     monitor_wrap.h readconf.c readconf.h servconf.c servconf.h session.c ssh.1
     ssh.c ssh_config.5 sshconnect1.c sshd.c sshd_config.5 ssh.h]
     remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1);
     test+ok henning@
 - (dtucker) [Makefile.in acconfig.h configure.ac] Remove KRB4/AFS support.
 - (dtucker) [auth-krb4.c radix.c radix.h] Remove KRB4/AFS specific files.

I hope I got this right....

1 files changed, 2 insertions, 7 deletions

diff --git a/ssh.c b/ssh.c
index 2bcd5871e..82b40193d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.197 2003/07/16 10:34:53 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.198 2003/07/22 13:35:22 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -154,9 +154,7 @@ usage(void)
              _PATH_SSH_USER_CONFFILE);
         fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
         fprintf(stderr, "  -a          Disable authentication agent forwarding (default).\n");
-#ifdef AFS
-        fprintf(stderr, "  -k          Disable Kerberos ticket and AFS token forwarding.\n");
-#endif                          /* AFS */
+        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 "
@@ -306,12 +304,9 @@ again:
                 case 'A':
                         options.forward_agent = 1;
                         break;
-#ifdef AFS
                 case 'k':
                         options.kerberos_tgt_passing = 0;
-                        options.afs_token_passing = 0;
                         break;
-#endif
                 case 'i':
                         if (stat(optarg, &st) < 0) {
                                 fprintf(stderr, "Warning: Identity file %s "