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 | |
parent | ffda4cb2181683af35a4aee85c00d83ed9b7f11c (diff) |
- jakob@cvs.openbsd.org 2003/05/15 04:08:44
[readconf.c servconf.c]
disable kerberos when not supported. ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 14 | ||||
-rw-r--r-- | servconf.c | 6 |
3 files changed, 22 insertions, 3 deletions
@@ -121,6 +121,9 @@ | |||
121 | http://bugzilla.mindrot.org/show_bug.cgi?id=560 | 121 | http://bugzilla.mindrot.org/show_bug.cgi?id=560 |
122 | Privsep child continues to run after monitor killed. | 122 | Privsep child continues to run after monitor killed. |
123 | Pass monitor signals through to child; Darren Tucker | 123 | Pass monitor signals through to child; Darren Tucker |
124 | - jakob@cvs.openbsd.org 2003/05/15 04:08:44 | ||
125 | [readconf.c servconf.c] | ||
126 | disable kerberos when not supported. ok markus@ | ||
124 | - (djm) Make portable build with MIT krb5 (some issues remain) | 127 | - (djm) Make portable build with MIT krb5 (some issues remain) |
125 | - (djm) Add new UsePAM configuration directive to allow runtime control | 128 | - (djm) Add new UsePAM configuration directive to allow runtime control |
126 | over usage of PAM. This allows non-root use of sshd when built with | 129 | over usage of PAM. This allows non-root use of sshd when built with |
@@ -1516,4 +1519,4 @@ | |||
1516 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1519 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1517 | ok provos@ | 1520 | ok provos@ |
1518 | 1521 | ||
1519 | $Id: ChangeLog,v 1.2716 2003/05/15 03:57:51 djm Exp $ | 1522 | $Id: ChangeLog,v 1.2717 2003/05/15 04:15:23 djm Exp $ |
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) |
diff --git a/servconf.c b/servconf.c index 5076c5df6..92d3170b2 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.119 2003/05/15 01:48:10 jakob Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.120 2003/05/15 04:08:44 jakob Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) | 15 | #if defined(KRB4) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -203,7 +203,11 @@ fill_default_server_options(ServerOptions *options) | |||
203 | if (options->kerberos_or_local_passwd == -1) | 203 | if (options->kerberos_or_local_passwd == -1) |
204 | options->kerberos_or_local_passwd = 1; | 204 | options->kerberos_or_local_passwd = 1; |
205 | if (options->kerberos_ticket_cleanup == -1) | 205 | if (options->kerberos_ticket_cleanup == -1) |
206 | #if defined(KRB4) || defined(KRB5) | ||
206 | options->kerberos_ticket_cleanup = 1; | 207 | options->kerberos_ticket_cleanup = 1; |
208 | #else | ||
209 | options->kerberos_ticket_cleanup = 0; | ||
210 | #endif | ||
207 | if (options->kerberos_tgt_passing == -1) | 211 | if (options->kerberos_tgt_passing == -1) |
208 | options->kerberos_tgt_passing = 0; | 212 | options->kerberos_tgt_passing = 0; |
209 | if (options->afs_token_passing == -1) | 213 | if (options->afs_token_passing == -1) |