diff options
author | Damien Miller <djm@mindrot.org> | 2003-05-15 14:15:23 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-05-15 14:15:23 +1000 |
commit | d248b5bd1bc1999a4d5d5ba7b433fc50e267baf6 (patch) | |
tree | 12f967ff4d257932e1708115cb2189119e247337 /readconf.c | |
parent | ffda4cb2181683af35a4aee85c00d83ed9b7f11c (diff) |
- jakob@cvs.openbsd.org 2003/05/15 04:08:44
[readconf.c servconf.c]
disable kerberos when not supported. ok markus@
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c index 4c5d44859..3f2ac4e3e 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.108 2003/05/15 01:48:10 jakob Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.109 2003/05/15 04:08:44 jakob Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -844,11 +844,23 @@ fill_default_options(Options * options) | |||
844 | if (options->challenge_response_authentication == -1) | 844 | if (options->challenge_response_authentication == -1) |
845 | options->challenge_response_authentication = 1; | 845 | options->challenge_response_authentication = 1; |
846 | if (options->kerberos_authentication == -1) | 846 | if (options->kerberos_authentication == -1) |
847 | #if defined(KRB4) || defined(KRB5) | ||
847 | options->kerberos_authentication = 1; | 848 | options->kerberos_authentication = 1; |
849 | #else | ||
850 | options->kerberos_authentication = 0; | ||
851 | #endif | ||
848 | if (options->kerberos_tgt_passing == -1) | 852 | if (options->kerberos_tgt_passing == -1) |
853 | #if defined(KRB4) || defined(KRB5) | ||
849 | options->kerberos_tgt_passing = 1; | 854 | options->kerberos_tgt_passing = 1; |
855 | #else | ||
856 | options->kerberos_tgt_passing = 0; | ||
857 | #endif | ||
850 | if (options->afs_token_passing == -1) | 858 | if (options->afs_token_passing == -1) |
859 | #if defined(AFS) | ||
851 | options->afs_token_passing = 1; | 860 | options->afs_token_passing = 1; |
861 | #else | ||
862 | options->afs_token_passing = 0; | ||
863 | #endif | ||
852 | if (options->password_authentication == -1) | 864 | if (options->password_authentication == -1) |
853 | options->password_authentication = 1; | 865 | options->password_authentication = 1; |
854 | if (options->kbd_interactive_authentication == -1) | 866 | if (options->kbd_interactive_authentication == -1) |