summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/sshd.c b/sshd.c
index 8d04f6a74..47df9caf1 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.275 2003/08/13 08:46:31 markus Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.276 2003/08/28 12:54:34 markus Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -1463,14 +1463,6 @@ main(int ac, char **av)
1463 1463
1464 sshd_exchange_identification(sock_in, sock_out); 1464 sshd_exchange_identification(sock_in, sock_out);
1465 1465
1466#ifdef KRB5
1467 if (!packet_connection_is_ipv4() &&
1468 options.kerberos_authentication) {
1469 debug("Kerberos Authentication disabled, only available for IPv4.");
1470 options.kerberos_authentication = 0;
1471 }
1472#endif
1473
1474 packet_set_nonblocking(); 1466 packet_set_nonblocking();
1475 1467
1476 /* prepare buffers to collect authentication messages */ 1468 /* prepare buffers to collect authentication messages */
@@ -1634,12 +1626,6 @@ do_ssh1_kex(void)
1634 auth_mask |= 1 << SSH_AUTH_RHOSTS_RSA; 1626 auth_mask |= 1 << SSH_AUTH_RHOSTS_RSA;
1635 if (options.rsa_authentication) 1627 if (options.rsa_authentication)
1636 auth_mask |= 1 << SSH_AUTH_RSA; 1628 auth_mask |= 1 << SSH_AUTH_RSA;
1637#ifdef KRB5
1638 if (options.kerberos_authentication)
1639 auth_mask |= 1 << SSH_AUTH_KERBEROS;
1640 if (options.kerberos_tgt_passing)
1641 auth_mask |= 1 << SSH_PASS_KERBEROS_TGT;
1642#endif
1643 if (options.challenge_response_authentication == 1) 1629 if (options.challenge_response_authentication == 1)
1644 auth_mask |= 1 << SSH_AUTH_TIS; 1630 auth_mask |= 1 << SSH_AUTH_TIS;
1645 if (options.password_authentication) 1631 if (options.password_authentication)