diff options
| author | assar <assar@FreeBSD.org> | 2001-03-04 02:22:04 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-03-04 02:22:04 +0000 |
| commit | 4e2eb78ecad4a6b5a760ceda4af304065081189c (patch) | |
| tree | 6d42c4750bdcef3dce92b8a7ffe828efcceed7d8 /crypto/openssh/sshd.c | |
| parent | 3a29c2f4df782f7fddae75438b810805211a8ce8 (diff) | |
| download | FreeBSD-src-4e2eb78ecad4a6b5a760ceda4af304065081189c.zip FreeBSD-src-4e2eb78ecad4a6b5a760ceda4af304065081189c.tar.gz | |
Add code for being compatible with ssh.com's krb5 authentication.
It is done by using the same ssh messages for v4 and v5 authentication
(since the ssh.com does not now anything about v4) and looking at the
contents after unpacking it to see if it is v4 or v5.
Based on code from Björn Grönvall <bg@sics.se>
PR: misc/20504
Diffstat (limited to 'crypto/openssh/sshd.c')
| -rw-r--r-- | crypto/openssh/sshd.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 5073465..89fb0ae 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -1063,11 +1063,11 @@ main(int ac, char **av) options.rhosts_authentication = 0; options.rhosts_rsa_authentication = 0; } -#ifdef KRB4 +#if defined(KRB4) && !defined(KRB5) if (!packet_connection_is_ipv4() && - options.krb4_authentication) { + options.kerberos_authentication) { debug("Kerberos Authentication disabled, only available for IPv4."); - options.krb4_authentication = 0; + options.kerberos_authentication = 0; } #endif /* KRB4 */ @@ -1164,18 +1164,13 @@ do_ssh1_kex() auth_mask |= 1 << SSH_AUTH_RHOSTS_RSA; if (options.rsa_authentication) auth_mask |= 1 << SSH_AUTH_RSA; -#ifdef KRB4 - if (options.krb4_authentication) - auth_mask |= 1 << SSH_AUTH_KRB4; +#if defined(KRB4) || defined(KRB5) + if (options.kerberos_authentication) + auth_mask |= 1 << SSH_AUTH_KERBEROS; #endif #ifdef KRB5 - if (options.krb5_authentication) { - auth_mask |= 1 << SSH_AUTH_KRB5; - /* compatibility with MetaCentre ssh */ - auth_mask |= 1 << SSH_AUTH_KRB4; - } if (options.krb5_tgt_passing) - auth_mask |= 1 << SSH_PASS_KRB5_TGT; + auth_mask |= 1 << SSH_PASS_KERBEROS_TGT; #endif /* KRB5 */ #ifdef AFS |
