[src/trunk]: src/crypto/dist/ssh Put Kerberos configuration options back into...

[elric <elric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/01e028803d56
branches:  trunk
changeset: 573940:01e028803d56
user:      elric <elric%NetBSD.org@localhost>
date:      Wed Feb 16 05:04:05 2005 +0000

description:
Put Kerberos configuration options back into client config parsing
routines.

diffstat:

 crypto/dist/ssh/readconf.c |  42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diffs (81 lines):

diff -r 877d3ca368d1 -r 01e028803d56 crypto/dist/ssh/readconf.c
--- a/crypto/dist/ssh/readconf.c        Wed Feb 16 03:45:41 2005 +0000
+++ b/crypto/dist/ssh/readconf.c        Wed Feb 16 05:04:05 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readconf.c,v 1.22 2005/02/13 05:57:26 christos Exp $   */
+/*     $NetBSD: readconf.c,v 1.23 2005/02/16 05:04:05 elric Exp $      */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -14,7 +14,7 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: readconf.c,v 1.134 2004/07/11 17:48:47 deraadt Exp $");
-__RCSID("$NetBSD: readconf.c,v 1.22 2005/02/13 05:57:26 christos Exp $");
+__RCSID("$NetBSD: readconf.c,v 1.23 2005/02/16 05:04:05 elric Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -409,10 +409,27 @@
                intptr = &options->challenge_response_authentication;
                goto parse_flag;
 
+#if defined(KRB4) || defined(KRB5)
+       case oKerberosAuthentication:
+               intptr = &options->kerberos_authentication;
+               goto parse_flag;
+#endif
+#if defined(AFS) || defined(KRB5)
+       case oKerberosTgtPassing:
+               intptr = &options->kerberos_tgt_passing;
+               goto parse_flag;
+#endif
+
        case oGssAuthentication:
                intptr = &options->gss_authentication;
                goto parse_flag;
 
+#ifdef AFS
+       case oAFSTokenPassing:
+               intptr = &options->afs_token_passing;
+               goto parse_flag;
+#endif
+
        case oGssDelegateCreds:
                intptr = &options->gss_deleg_creds;
                goto parse_flag;
@@ -884,6 +901,15 @@
        options->rsa_authentication = -1;
        options->pubkey_authentication = -1;
        options->challenge_response_authentication = -1;
+#if defined(KRB4) || defined(KRB5)
+       options->kerberos_authentication = -1;
+#endif
+#if defined(AFS) || defined(KRB5)
+       options->kerberos_tgt_passing = -1;
+#endif
+#ifdef AFS
+       options->afs_token_passing = -1;
+#endif
        options->gss_authentication = -1;
        options->gss_deleg_creds = -1;
        options->password_authentication = -1;
@@ -964,6 +990,18 @@
                options->pubkey_authentication = 1;
        if (options->challenge_response_authentication == -1)
                options->challenge_response_authentication = 1;
+#if defined(KRB4) || defined(KRB5)
+       if (options->kerberos_authentication == -1)
+               options->kerberos_authentication = 1;
+#endif
+#if defined(AFS) || defined(KRB5)
+       if (options->kerberos_tgt_passing == -1)
+               options->kerberos_tgt_passing = 1;
+#endif
+#ifdef AFS
+       if (options->afs_token_passing == -1)
+               options->afs_token_passing = 1;
+#endif
        if (options->gss_authentication == -1)
                options->gss_authentication = 0;
        if (options->gss_deleg_creds == -1)