merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

[gssapi-openssh.git] / openssh / readconf.h

diff --git a/openssh/readconf.h b/openssh/readconf.h
index 9396f177cf674808151144ba58a234464447cf85..12477c05681b36dbfa5323ef5c142683a3749c80 100644 (file)
--- a/openssh/readconf.h
+++ b/openssh/readconf.h
@@ -44,9 +44,11 @@ typedef struct {
        int     challenge_response_authentication;
                                        /* Try S/Key or TIS, authentication. */
        int     gss_authentication;     /* Try GSS authentication */
-       int     gss_keyex;              /* Try GSS key exchange */
+       int     gss_keyex;              /* Try GSS key exchange */
        int     gss_deleg_creds;        /* Delegate GSS credentials */
        int     gss_trust_dns;          /* Trust DNS for GSS canonicalization */
+       int     gss_renewal_rekey;      /* Credential renewal forces rekey */
+       char    *gss_client_identity;   /* Principal to initiate GSSAPI with */
        int     password_authentication;        /* Try password
                                                 * authentication. */
        int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */