diff options
| author |   jakob <jakob@openbsd.org> | 2003-05-15 04:08:44 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2003-05-15 04:08:44 +0000 |
| commit | 0856adaf17751e96f190829a5b1cafaf1f882194 (patch) | |
| tree | 9c14121c0fe79cf16c6c6639363107ac6401c321 | |
| parent | ~B is ssh2 only (diff) | |
| download | wireguard-openbsd-0856adaf17751e96f190829a5b1cafaf1f882194.tar.xz wireguard-openbsd-0856adaf17751e96f190829a5b1cafaf1f882194.zip | |
disable kerberos when not supported. ok markus@
| -rw-r--r-- | usr.bin/ssh/readconf.c | 14 | ||||
| -rw-r--r-- | usr.bin/ssh/servconf.c | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index fc881b660e5..6634b215962 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.108 2003/05/15 01:48:10 jakob Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.109 2003/05/15 04:08:44 jakob Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -842,11 +842,23 @@ fill_default_options(Options * options) if (options->challenge_response_authentication == -1) options->challenge_response_authentication = 1; if (options->kerberos_authentication == -1) +#if defined(KRB4) || defined(KRB5) options->kerberos_authentication = 1; +#else + options->kerberos_authentication = 0; +#endif if (options->kerberos_tgt_passing == -1) +#if defined(KRB4) || defined(KRB5) options->kerberos_tgt_passing = 1; +#else + options->kerberos_tgt_passing = 0; +#endif if (options->afs_token_passing == -1) +#if defined(AFS) options->afs_token_passing = 1; +#else + options->afs_token_passing = 0; +#endif if (options->password_authentication == -1) options->password_authentication = 1; if (options->kbd_interactive_authentication == -1) diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index f437fd94d7e..50e59602086 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.119 2003/05/15 01:48:10 jakob Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.120 2003/05/15 04:08:44 jakob Exp $"); #if defined(KRB4) #include <krb.h> @@ -180,7 +180,11 @@ fill_default_server_options(ServerOptions *options) if (options->kerberos_or_local_passwd == -1) options->kerberos_or_local_passwd = 1; if (options->kerberos_ticket_cleanup == -1) +#if defined(KRB4) || defined(KRB5) options->kerberos_ticket_cleanup = 1; +#else + options->kerberos_ticket_cleanup = 0; +#endif if (options->kerberos_tgt_passing == -1) options->kerberos_tgt_passing = 0; if (options->afs_token_passing == -1) |