summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/readconf.h b/readconf.h
index 6066d4635..56cbec539 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.46 2003/04/01 10:22:21 markus Exp $ */ 1/* $OpenBSD: readconf.h,v 1.55 2003/09/01 18:15:50 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -33,7 +33,6 @@ typedef struct {
33 char *xauth_location; /* Location for xauth program */ 33 char *xauth_location; /* Location for xauth program */
34 int gateway_ports; /* Allow remote connects to forwarded ports. */ 34 int gateway_ports; /* Allow remote connects to forwarded ports. */
35 int use_privileged_port; /* Don't use privileged port if false. */ 35 int use_privileged_port; /* Don't use privileged port if false. */
36 int rhosts_authentication; /* Try rhosts authentication. */
37 int rhosts_rsa_authentication; /* Try rhosts with RSA 36 int rhosts_rsa_authentication; /* Try rhosts with RSA
38 * authentication. */ 37 * authentication. */
39 int rsa_authentication; /* Try RSA authentication. */ 38 int rsa_authentication; /* Try RSA authentication. */
@@ -41,15 +40,8 @@ typedef struct {
41 int hostbased_authentication; /* ssh2's rhosts_rsa */ 40 int hostbased_authentication; /* ssh2's rhosts_rsa */
42 int challenge_response_authentication; 41 int challenge_response_authentication;
43 /* Try S/Key or TIS, authentication. */ 42 /* Try S/Key or TIS, authentication. */
44#if defined(KRB4) || defined(KRB5) 43 int gss_authentication; /* Try GSS authentication */
45 int kerberos_authentication; /* Try Kerberos authentication. */ 44 int gss_deleg_creds; /* Delegate GSS credentials */
46#endif
47#if defined(AFS) || defined(KRB5)
48 int kerberos_tgt_passing; /* Try Kerberos TGT passing. */
49#endif
50#ifdef AFS
51 int afs_token_passing; /* Try AFS token passing. */
52#endif
53 int password_authentication; /* Try password 45 int password_authentication; /* Try password
54 * authentication. */ 46 * authentication. */
55 int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ 47 int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
@@ -66,8 +58,11 @@ typedef struct {
66 LogLevel log_level; /* Level for logging. */ 58 LogLevel log_level; /* Level for logging. */
67 59
68 int port; /* Port to connect. */ 60 int port; /* Port to connect. */
61 int address_family;
69 int connection_attempts; /* Max attempts (seconds) before 62 int connection_attempts; /* Max attempts (seconds) before
70 * giving up */ 63 * giving up */
64 int connection_timeout; /* Max time (seconds) before
65 * aborting connection attempt */
71 int number_of_password_prompts; /* Max number of password 66 int number_of_password_prompts; /* Max number of password
72 * prompts. */ 67 * prompts. */
73 int cipher; /* Cipher to use. */ 68 int cipher; /* Cipher to use. */
@@ -88,6 +83,7 @@ typedef struct {
88 char *preferred_authentications; 83 char *preferred_authentications;
89 char *bind_address; /* local socket address for connection to sshd */ 84 char *bind_address; /* local socket address for connection to sshd */
90 char *smartcard_device; /* Smartcard reader device */ 85 char *smartcard_device; /* Smartcard reader device */
86 int verify_host_key_dns; /* Verify host key using DNS */
91 87
92 int num_identity_files; /* Number of files for RSA/DSA identities. */ 88 int num_identity_files; /* Number of files for RSA/DSA identities. */
93 char *identity_files[SSH_MAX_IDENTITY_FILES]; 89 char *identity_files[SSH_MAX_IDENTITY_FILES];
@@ -103,6 +99,7 @@ typedef struct {
103 int clear_forwardings; 99 int clear_forwardings;
104 100
105 int enable_ssh_keysign; 101 int enable_ssh_keysign;
102 int rekey_limit;
106 int no_host_authentication_for_localhost; 103 int no_host_authentication_for_localhost;
107} Options; 104} Options;
108 105