diff options
| author | assar <assar@FreeBSD.org> | 2001-09-04 13:27:04 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-09-04 13:27:04 +0000 |
| commit | 6d29950919d703554d8c9b0caebf5f4dacd1011d (patch) | |
| tree | 18934e3c8ae8d009b904b4f660f592cd96072938 /crypto/openssh | |
| parent | 838d91e72589ce25aaee9875868cc9b01c8af0a4 (diff) | |
| download | FreeBSD-src-6d29950919d703554d8c9b0caebf5f4dacd1011d.zip FreeBSD-src-6d29950919d703554d8c9b0caebf5f4dacd1011d.tar.gz | |
fix renamed options in some of the code that was #ifdef AFS
also print an error if krb5 ticket passing is disabled
Submitted by: Jonathan Chen <jon@spock.org>
Diffstat (limited to 'crypto/openssh')
| -rw-r--r-- | crypto/openssh/auth1.c | 5 | ||||
| -rw-r--r-- | crypto/openssh/ssh.c | 2 | ||||
| -rw-r--r-- | crypto/openssh/sshconnect1.c | 2 | ||||
| -rw-r--r-- | crypto/openssh/sshd.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/crypto/openssh/auth1.c b/crypto/openssh/auth1.c index d5eb4d8..462b492 100644 --- a/crypto/openssh/auth1.c +++ b/crypto/openssh/auth1.c @@ -154,7 +154,7 @@ do_authloop(Authctxt *authctxt) switch (type) { #ifdef AFS #ifndef KRB5 - case SSH_CMSG_HAVE_KRB4_TGT: + case SSH_CMSG_HAVE_KERBEROS_TGT: if (!options.krb4_tgt_passing) { /* packet_get_all(); */ verbose("Kerberos v4 tgt passing disabled."); @@ -406,7 +406,8 @@ do_authloop(Authctxt *authctxt) /* Passing krb5 ticket */ if (!options.krb5_tgt_passing /*|| !options.krb5_authentication */) { - + verbose("Kerberos v5 tgt passing disabled."); + break; } if (tkt_client == NULL) { diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index 49c383a..21b5370 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -362,7 +362,9 @@ main(int ac, char **av) #ifdef AFS case 'k': options.krb4_tgt_passing = 0; +#ifdef KRB5 options.krb5_tgt_passing = 0; +#endif options.afs_token_passing = 0; break; #endif diff --git a/crypto/openssh/sshconnect1.c b/crypto/openssh/sshconnect1.c index c324aaf..60d16b1 100644 --- a/crypto/openssh/sshconnect1.c +++ b/crypto/openssh/sshconnect1.c @@ -973,7 +973,7 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host, #ifdef AFS /* Try Kerberos tgt passing if the server supports it. */ - if ((supported_authentications & (1 << SSH_PASS_KRB4_TGT)) && + if ((supported_authentications & (1 << SSH_PASS_KERBEROS_TGT)) && options.krb4_tgt_passing) { if (options.cipher == SSH_CIPHER_NONE) log("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!"); diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 61dbf06..933a2b4 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -1253,7 +1253,7 @@ do_ssh1_kex(void) #ifdef AFS if (options.krb4_tgt_passing) - auth_mask |= 1 << SSH_PASS_KRB4_TGT; + auth_mask |= 1 << SSH_PASS_KERBEROS_TGT; if (options.afs_token_passing) auth_mask |= 1 << SSH_PASS_AFS_TOKEN; #endif |
