diff options
| author |   markus <markus@openbsd.org> | 2003-07-22 13:35:22 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2003-07-22 13:35:22 +0000 |
| commit | 493d1072e840ceb2a170b1aefb9da33feaaba8f2 (patch) | |
| tree | 884d2fc14a066fba07c5102525e885b084d51f9d /usr.bin/ssh/ssh.c | |
| parent | uiomove takes void * now. (diff) | |
| download | wireguard-openbsd-493d1072e840ceb2a170b1aefb9da33feaaba8f2.tar.xz wireguard-openbsd-493d1072e840ceb2a170b1aefb9da33feaaba8f2.zip | |
remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1);
test+ok henning@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 921ab7d7afb..1c7960f1704 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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> @@ -150,9 +150,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 " @@ -297,12 +295,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 " |