merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

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

diff --git a/openssh/servconf.h b/openssh/servconf.h
index fd8b90975c7d5331b477e8a12817c183d3b181e0..2c9f00e5a47192b47228b9ccb113b45b4eaca563 100644 (file)
--- a/openssh/servconf.h
+++ b/openssh/servconf.h
@@ -95,13 +95,14 @@ typedef struct {
 #endif
        int     kerberos_get_afs_token;         /* If true, try to get AFS token if
                                                 * authenticated with Kerberos. */
+       int     gsi_allow_limited_proxy;        /* If true, accept limited proxies */
        int     gss_authentication;     /* If true, permit GSSAPI authentication */
        int     gss_deleg_creds;        /* If true, store delegated GSSAPI credentials*/
-       int     gss_keyex;              /* If true, permit GSSAPI key exchange */
+       int     gss_keyex;              /* If true, permit GSSAPI key exchange */
        int     gss_cleanup_creds;      /* If true, destroy cred cache on logout */
-       int     gss_strict_acceptor;    /* If true, restrict the GSSAPI acceptor name */
        char*   gss_creds_path; /* If true, destroy cred cache on logout */
-       int     gsi_allow_limited_proxy;        /* If true, accept limited proxies */
+       int     gss_strict_acceptor;    /* If true, restrict the GSSAPI acceptor name */
+       int     gss_store_rekey;
        int     password_authentication;        /* If true, permit password
                                                 * authentication. */
        int     kbd_interactive_authentication; /* If true, permit */