merged OpenSSH 5.3p1 to trunk

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

diff --git a/openssh/readconf.h b/openssh/readconf.h
index 9396f177cf674808151144ba58a234464447cf85..283a8552ce18c59012128c6395476897ce87504f 100644 (file)
--- a/openssh/readconf.h
+++ b/openssh/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.78 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.79 2009/06/27 09:35:06 andreas Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -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. */
@@ -134,6 +136,8 @@ typedef struct {
        int     permit_local_command;
        int     visual_host_key;
 
+       int     use_roaming;
+
 }       Options;
 
 #define SSHCTL_MASTER_NO       0