1 files changed, 24 insertions, 2 deletions

diff --git a/readconf.c b/readconf.c
index 96ad25a51..9447cb55f 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.117 2003/08/13 09:07:09 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.118 2003/08/22 10:56:09 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -105,7 +105,7 @@ typedef enum {
         oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
-        oAddressFamily,
+        oAddressFamily, oGssAuthentication, oGssDelegateCreds,
         oDeprecated, oUnsupported
 } OpCodes;
 
@@ -140,6 +140,14 @@ static struct {
         { "kerberostgtpassing", oUnsupported },
 #endif
         { "afstokenpassing", oUnsupported },
+#if defined(GSSAPI)
+        { "gssapiauthentication", oGssAuthentication },
+        { "gssapidelegatecreds", oGssDelegateCreds },
+        { "gssapidelegatecredentials", oGssDelegateCreds },
+#else
+        { "gssapiauthentication", oUnsupported },
+        { "gssapidelegatecredentials", oUnsupported },
+#endif
         { "fallbacktorsh", oDeprecated },
         { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },
@@ -389,6 +397,14 @@ parse_flag:
                 intptr = &options->kerberos_tgt_passing;
                 goto parse_flag;
 
+        case oGssAuthentication:
+                intptr = &options->gss_authentication;
+                goto parse_flag;
+
+        case oGssDelegateCreds:
+                intptr = &options->gss_deleg_creds;
+                goto parse_flag;
+
         case oBatchMode:
                 intptr = &options->batch_mode;
                 goto parse_flag;
@@ -813,6 +829,8 @@ initialize_options(Options * options)
         options->challenge_response_authentication = -1;
         options->kerberos_authentication = -1;
         options->kerberos_tgt_passing = -1;
+        options->gss_authentication = -1;
+        options->gss_deleg_creds = -1;
         options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;
         options->kbd_interactive_devices = NULL;
@@ -887,6 +905,10 @@ fill_default_options(Options * options)
                 options->kerberos_authentication = 1;
         if (options->kerberos_tgt_passing == -1)
                 options->kerberos_tgt_passing = 1;
+        if (options->gss_authentication == -1)
+                options->gss_authentication = 1;
+        if (options->gss_deleg_creds == -1)
+                options->gss_deleg_creds = 0;
         if (options->password_authentication == -1)
                 options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)