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 1dcd25c91ca77d3ae7b59e07c03e6f278eb1b6a1..2c9f00e5a47192b47228b9ccb113b45b4eaca563 100644 (file)
--- a/openssh/servconf.h
+++ b/openssh/servconf.h
@@ -88,11 +88,19 @@ typedef struct {
                                                 * /etc/passwd */
        int     kerberos_ticket_cleanup;        /* If true, destroy ticket
                                                 * file on logout. */
+#ifdef SESSION_HOOKS
+        int     session_hooks_allow;        /* If true, permit user hooks */
+        char*   session_hooks_startup_cmd;  /* cmd to be executed before */
+        char*   session_hooks_shutdown_cmd; /* cmd to be executed after */
+#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_cleanup_creds;      /* If true, destroy cred cache on logout */
+       char*   gss_creds_path; /* If true, destroy cred cache on logout */
        int     gss_strict_acceptor;    /* If true, restrict the GSSAPI acceptor name */
        int     gss_store_rekey;
        int     password_authentication;        /* If true, permit password
@@ -148,6 +156,7 @@ typedef struct {
        char   *adm_forced_command;
 
        int     use_pam;                /* Enable auth via PAM */
+       int     permit_pam_user_change; /* Allow PAM to change user name */
         int     none_enabled;           /* enable NONE cipher switch */
         int     tcp_rcv_buf_poll;       /* poll tcp rcv window in autotuning kernels*/
        int     hpn_disabled;           /* disable hpn functionality. false by default */