From 37dce23afc624dfc2ebae4614ddd17d5e376a901 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Mon, 28 Feb 2000 19:03:50 +0000
Subject: 1) Add kerberos5 functionality.    by Daniel Kouril
 <kouril@informatics.muni.cz> 2) Add full LOGIN_CAP capability    by Andrey
 Chernov

---
 crypto/openssh/readconf.c | 55 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 14 deletions(-)

(limited to 'crypto/openssh/readconf.c')

diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index b2da36f..f44ee55 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -93,10 +93,13 @@ typedef enum {
 	oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh,
 	oSkeyAuthentication,
 #ifdef KRB4
-	oKerberosAuthentication,
+	oKrb4Authentication,
 #endif /* KRB4 */
+#ifdef KRB5
+	oKrb5Authentication, oKrb5TgtPassing,
+#endif /* KRB5 */
 #ifdef AFS
-	oKerberosTgtPassing, oAFSTokenPassing,
+	oKrb4TgtPassing, oAFSTokenPassing,
 #endif
 	oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
 	oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
@@ -121,10 +124,14 @@ static struct {
 	{ "rsaauthentication", oRSAAuthentication },
 	{ "skeyauthentication", oSkeyAuthentication },
 #ifdef KRB4
-	{ "kerberosauthentication", oKerberosAuthentication },
+	{ "kerberos4authentication", oKrb4Authentication },
 #endif /* KRB4 */
+#ifdef KRB5
+	{ "kerberos5authentication", oKrb5Authentication },
+	{ "kerberos5tgtpassing", oKrb5TgtPassing },
+#endif /* KRB5 */
 #ifdef AFS
-	{ "kerberostgtpassing", oKerberosTgtPassing },
+	{ "kerberos4tgtpassing", oKrb4TgtPassing },
 	{ "afstokenpassing", oAFSTokenPassing },
 #endif
 	{ "fallbacktorsh", oFallBackToRsh },
@@ -298,14 +305,24 @@ parse_flag:
 		goto parse_flag;
 
 #ifdef KRB4
-	case oKerberosAuthentication:
-		intptr = &options->kerberos_authentication;
+	case oKrb4Authentication:
+		intptr = &options->krb4_authentication;
 		goto parse_flag;
 #endif /* KRB4 */
 
+#ifdef KRB5
+	case oKrb5Authentication:
+		intptr = &options->krb5_authentication;
+		goto parse_flag;
+
+	case oKrb5TgtPassing:
+		intptr = &options->krb5_tgt_passing;
+		goto parse_flag;
+#endif /* KRB5 */
+
 #ifdef AFS
-	case oKerberosTgtPassing:
-		intptr = &options->kerberos_tgt_passing;
+	case oKrb4TgtPassing:
+		intptr = &options->krb4_tgt_passing;
 		goto parse_flag;
 
 	case oAFSTokenPassing:
@@ -596,10 +613,14 @@ initialize_options(Options * options)
 	options->rsa_authentication = -1;
 	options->skey_authentication = -1;
 #ifdef KRB4
-	options->kerberos_authentication = -1;
+	options->krb4_authentication = -1;
 #endif
+#ifdef KRB5
+	options->krb5_authentication = -1;
+	options->krb5_tgt_passing = -1;
+#endif /* KRB5 */
 #ifdef AFS
-	options->kerberos_tgt_passing = -1;
+	options->krb4_tgt_passing = -1;
 	options->afs_token_passing = -1;
 #endif
 	options->password_authentication = -1;
@@ -651,12 +672,18 @@ fill_default_options(Options * options)
 	if (options->skey_authentication == -1)
 		options->skey_authentication = 0;
 #ifdef KRB4
-	if (options->kerberos_authentication == -1)
-		options->kerberos_authentication = 1;
+	if (options->krb4_authentication == -1)
+		options->krb4_authentication = 1;
 #endif /* KRB4 */
+#ifdef KRB5
+	if (options->krb5_authentication == -1)
+		options->krb5_authentication = 1;
+	if (options->krb5_tgt_passing == -1)
+		options->krb5_tgt_passing = 1;
+#endif /* KRB5 */
 #ifdef AFS
-	if (options->kerberos_tgt_passing == -1)
-		options->kerberos_tgt_passing = 1;
+	if (options->krb4_tgt_passing == -1)
+		options->krb4_tgt_passing = 1;
 	if (options->afs_token_passing == -1)
 		options->afs_token_passing = 1;
 #endif /* AFS */
-- 
cgit v1.1