summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDug Song <dugsong@cvs.openbsd.org>1999-10-17 23:09:17 +0000
committerDug Song <dugsong@cvs.openbsd.org>1999-10-17 23:09:17 +0000
commite17d90eae9b2a369b9989de52d61878006cc9322 (patch)
treee9701ce72c58fe4b0fc14613f581a1e2e457355d /usr.bin/ssh
parent03dc575da52ca42feca3018b7b1a4b270042ad18 (diff)
default KerberosOrLocalPassword to 'yes'
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/servconf.c4
-rw-r--r--usr.bin/ssh/sshd.84
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 6c492402cf9..ae59b54591e 100644
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -12,7 +12,7 @@ Created: Mon Aug 21 15:48:58 1995 ylo
*/
#include "includes.h"
-RCSID("$Id: servconf.c,v 1.17 1999/10/17 20:48:07 dugsong Exp $");
+RCSID("$Id: servconf.c,v 1.18 1999/10/17 23:09:16 dugsong Exp $");
#include "ssh.h"
#include "servconf.h"
@@ -117,7 +117,7 @@ void fill_default_server_options(ServerOptions *options)
if (options->kerberos_authentication == -1)
options->kerberos_authentication = (access(KEYFILE, R_OK) == 0);
if (options->kerberos_or_local_passwd == -1)
- options->kerberos_or_local_passwd = 0;
+ options->kerberos_or_local_passwd = 1;
if (options->kerberos_ticket_cleanup == -1)
options->kerberos_ticket_cleanup = 1;
#endif /* KRB4 */
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index cdad83a5c5a..4b3321588a2 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -9,7 +9,7 @@
.\"
.\" Created: Sat Apr 22 21:55:14 1995 ylo
.\"
-.\" $Id: sshd.8,v 1.19 1999/10/17 20:48:07 dugsong Exp $
+.\" $Id: sshd.8,v 1.20 1999/10/17 23:09:16 dugsong Exp $
.\"
.Dd September 25, 1999
.Dt SSHD 8
@@ -286,7 +286,7 @@ the password will be validated via any additional local mechanism
such as
.Pa /etc/passwd
or SecurID. Default is
-.Dq no .
+.Dq yes .
.It Cm KerberosTgtPassing
Specifies whether a Kerberos TGT may be forwarded to the server.
Default is