summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-04-23 21:04:51 +1000
committerDamien Miller <djm@mindrot.org>2002-04-23 21:04:51 +1000
commitd7de14b6ada79812cf3a1ceb8f921d92d4d180be (patch)
treec8750db01fe0d8b47ad3aafd68165ccd6b523197 /servconf.c
parent635fe98a7f156688fc3182d597c88592823a3d22 (diff)
- markus@cvs.openbsd.org 2002/04/22 16:16:53
[servconf.c sshd.8 sshd_config] do not auto-enable KerberosAuthentication; ok djm@, provos@, deraadt@
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c
index 5172813ec..4b5b406a7 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.106 2002/04/20 09:02:03 deraadt Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.107 2002/04/22 16:16:53 markus Exp $");
14 14
15#if defined(KRB4) 15#if defined(KRB4)
16#include <krb.h> 16#include <krb.h>
@@ -200,7 +200,7 @@ fill_default_server_options(ServerOptions *options)
200 options->pubkey_authentication = 1; 200 options->pubkey_authentication = 1;
201#if defined(KRB4) || defined(KRB5) 201#if defined(KRB4) || defined(KRB5)
202 if (options->kerberos_authentication == -1) 202 if (options->kerberos_authentication == -1)
203 options->kerberos_authentication = (access(KEYFILE, R_OK) == 0); 203 options->kerberos_authentication = 0;
204 if (options->kerberos_or_local_passwd == -1) 204 if (options->kerberos_or_local_passwd == -1)
205 options->kerberos_or_local_passwd = 1; 205 options->kerberos_or_local_passwd = 1;
206 if (options->kerberos_ticket_cleanup == -1) 206 if (options->kerberos_ticket_cleanup == -1)