diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 21 |
1 files changed, 4 insertions, 17 deletions
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.273 2003/07/16 10:34:53 markus Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.274 2003/07/22 13:35:22 markus Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -1476,20 +1476,13 @@ main(int ac, char **av) | |||
1476 | "originating port %d not trusted.", remote_port); | 1476 | "originating port %d not trusted.", remote_port); |
1477 | options.rhosts_authentication = 0; | 1477 | options.rhosts_authentication = 0; |
1478 | } | 1478 | } |
1479 | #if defined(KRB4) && !defined(KRB5) | 1479 | #ifdef KRB5 |
1480 | if (!packet_connection_is_ipv4() && | 1480 | if (!packet_connection_is_ipv4() && |
1481 | options.kerberos_authentication) { | 1481 | options.kerberos_authentication) { |
1482 | debug("Kerberos Authentication disabled, only available for IPv4."); | 1482 | debug("Kerberos Authentication disabled, only available for IPv4."); |
1483 | options.kerberos_authentication = 0; | 1483 | options.kerberos_authentication = 0; |
1484 | } | 1484 | } |
1485 | #endif /* KRB4 && !KRB5 */ | 1485 | #endif |
1486 | #ifdef AFS | ||
1487 | /* If machine has AFS, set process authentication group. */ | ||
1488 | if (k_hasafs()) { | ||
1489 | k_setpag(); | ||
1490 | k_unlog(); | ||
1491 | } | ||
1492 | #endif /* AFS */ | ||
1493 | 1486 | ||
1494 | packet_set_nonblocking(); | 1487 | packet_set_nonblocking(); |
1495 | 1488 | ||
@@ -1656,18 +1649,12 @@ do_ssh1_kex(void) | |||
1656 | auth_mask |= 1 << SSH_AUTH_RHOSTS_RSA; | 1649 | auth_mask |= 1 << SSH_AUTH_RHOSTS_RSA; |
1657 | if (options.rsa_authentication) | 1650 | if (options.rsa_authentication) |
1658 | auth_mask |= 1 << SSH_AUTH_RSA; | 1651 | auth_mask |= 1 << SSH_AUTH_RSA; |
1659 | #if defined(KRB4) || defined(KRB5) | 1652 | #ifdef KRB5 |
1660 | if (options.kerberos_authentication) | 1653 | if (options.kerberos_authentication) |
1661 | auth_mask |= 1 << SSH_AUTH_KERBEROS; | 1654 | auth_mask |= 1 << SSH_AUTH_KERBEROS; |
1662 | #endif | ||
1663 | #if defined(AFS) || defined(KRB5) | ||
1664 | if (options.kerberos_tgt_passing) | 1655 | if (options.kerberos_tgt_passing) |
1665 | auth_mask |= 1 << SSH_PASS_KERBEROS_TGT; | 1656 | auth_mask |= 1 << SSH_PASS_KERBEROS_TGT; |
1666 | #endif | 1657 | #endif |
1667 | #ifdef AFS | ||
1668 | if (options.afs_token_passing) | ||
1669 | auth_mask |= 1 << SSH_PASS_AFS_TOKEN; | ||
1670 | #endif | ||
1671 | if (options.challenge_response_authentication == 1) | 1658 | if (options.challenge_response_authentication == 1) |
1672 | auth_mask |= 1 << SSH_AUTH_TIS; | 1659 | auth_mask |= 1 << SSH_AUTH_TIS; |
1673 | if (options.password_authentication) | 1660 | if (options.password_authentication) |