tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- jakob@cvs.openbsd.org 2003/05/15 04:08:44 

[readconf.c servconf.c]
     disable kerberos when not supported. ok markus@
This commit is contained in:
Damien Miller 2003-05-15 14:15:23 +10:00
parent ffda4cb218
commit d248b5bd1b
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -121,6 +121,9 @@
http://bugzilla.mindrot.org/show_bug.cgi?id=560
Privsep child continues to run after monitor killed.
Pass monitor signals through to child; Darren Tucker
- jakob@cvs.openbsd.org 2003/05/15 04:08:44
[readconf.c servconf.c]
disable kerberos when not supported. ok markus@
- (djm) Make portable build with MIT krb5 (some issues remain)
- (djm) Add new UsePAM configuration directive to allow runtime control
over usage of PAM. This allows non-root use of sshd when built with
@ -1516,4 +1519,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
$Id: ChangeLog,v 1.2716 2003/05/15 03:57:51 djm Exp $
$Id: ChangeLog,v 1.2717 2003/05/15 04:15:23 djm Exp $

14
readconf.c
View File

@ -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"
@ -844,11 +844,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)

6
servconf.c
View File

@ -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>
@ -203,7 +203,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)