- jakob@cvs.openbsd.org 2003/12/23 16:12:10

     [servconf.c servconf.h session.c sshd_config]
     implement KerberosGetAFSToken server option. ok markus@, beck@

1 files changed, 11 insertions, 1 deletions

diff --git a/servconf.c b/servconf.c
index a6824a863..b832c75b3 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.129 2003/12/09 21:53:36 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.130 2003/12/23 16:12:10 jakob Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -72,6 +72,7 @@ initialize_server_options(ServerOptions *options)
         options->kerberos_authentication = -1;
         options->kerberos_or_local_passwd = -1;
         options->kerberos_ticket_cleanup = -1;
+        options->kerberos_get_afs_token = -1;
         options->gss_authentication=-1;
         options->gss_cleanup_creds = -1;
         options->password_authentication = -1;
@@ -181,6 +182,8 @@ fill_default_server_options(ServerOptions *options)
                 options->kerberos_or_local_passwd = 1;
         if (options->kerberos_ticket_cleanup == -1)
                 options->kerberos_ticket_cleanup = 1;
+        if (options->kerberos_get_afs_token == -1)
+                options->kerberos_get_afs_token = 0;
         if (options->gss_authentication == -1)
                 options->gss_authentication = 0;
         if (options->gss_cleanup_creds == -1)
@@ -250,6 +253,7 @@ typedef enum {
         sPermitRootLogin, sLogFacility, sLogLevel,
         sRhostsRSAAuthentication, sRSAAuthentication,
         sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,
+        sKerberosGetAFSToken,
         sKerberosTgtPassing, sChallengeResponseAuthentication,
         sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress,
         sPrintMotd, sPrintLastLog, sIgnoreRhosts,
@@ -301,10 +305,12 @@ static struct {
         { "kerberosauthentication", sKerberosAuthentication },
         { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
         { "kerberosticketcleanup", sKerberosTicketCleanup },
+        { "kerberosgetafstoken", sKerberosGetAFSToken },
 #else
         { "kerberosauthentication", sUnsupported },
         { "kerberosorlocalpasswd", sUnsupported },
         { "kerberosticketcleanup", sUnsupported },
+        { "kerberosgetafstoken", sUnsupported },
 #endif
         { "kerberostgtpassing", sUnsupported },
         { "afstokenpassing", sUnsupported },
@@ -630,6 +636,10 @@ parse_flag:
                 intptr = &options->kerberos_ticket_cleanup;
                 goto parse_flag;
 
+        case sKerberosGetAFSToken:
+                intptr = &options->kerberos_get_afs_token;
+                goto parse_flag;
+
         case sGssAuthentication:
                 intptr = &options->gss_authentication;
                 goto parse_flag;