diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/packet.h | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/usr.bin/ssh/packet.h b/usr.bin/ssh/packet.h index 2e846546521..055f2c8810c 100644 --- a/usr.bin/ssh/packet.h +++ b/usr.bin/ssh/packet.h @@ -13,7 +13,7 @@ * */ -/* RCSID("$Id: packet.h,v 1.8 2000/01/04 00:07:59 markus Exp $"); */ +/* RCSID("$Id: packet.h,v 1.9 2000/01/04 16:54:58 markus Exp $"); */ #ifndef PACKET_H #define PACKET_H @@ -191,7 +191,8 @@ do { \ } \ } while (0) -/* remote host is connected via a socket */ +/* remote host is connected via a socket/ipv4 */ int packet_connection_is_on_socket(void); +int packet_connection_is_ipv4(void); #endif /* PACKET_H */ diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 12ebf89eb94..e25ace295bf 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.75 2000/01/04 00:08:01 markus Exp $"); +RCSID("$Id: sshd.c,v 1.76 2000/01/04 16:54:58 markus Exp $"); #include <poll.h> @@ -848,6 +848,14 @@ main(int ac, char **av) options.rhosts_authentication = 0; options.rhosts_rsa_authentication = 0; } +#ifdef KRB4 + if (!packet_connection_is_ipv4() && + options.kerberos_authentication) { + debug("Kerberos Authentication disabled, only available for IPv4."); + options.kerberos_authentication = 0; + } +#endif /* KRB4 */ + packet_set_nonblocking(); /* Handle the connection. */ |