Deleted Added
full compact
readconf.h (215116) readconf.h (221420)
1/* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */
1/* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 djm Exp $ */
2
3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
5 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
6 * All rights reserved
7 * Functions for reading the configuration file.
8 *
9 * As far as I am concerned, the code I have written for this software

--- 44 unchanged lines hidden (view full) ---

54 int zero_knowledge_password_authentication; /* Try jpake */
55 int batch_mode; /* Batch mode: do not ask for passwords. */
56 int check_host_ip; /* Also keep track of keys for IP address */
57 int strict_host_key_checking; /* Strict host key checking. */
58 int compression; /* Compress packets in both directions. */
59 int compression_level; /* Compression level 1 (fast) to 9
60 * (best). */
61 int tcp_keep_alive; /* Set SO_KEEPALIVE. */
2
3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
5 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
6 * All rights reserved
7 * Functions for reading the configuration file.
8 *
9 * As far as I am concerned, the code I have written for this software

--- 44 unchanged lines hidden (view full) ---

54 int zero_knowledge_password_authentication; /* Try jpake */
55 int batch_mode; /* Batch mode: do not ask for passwords. */
56 int check_host_ip; /* Also keep track of keys for IP address */
57 int strict_host_key_checking; /* Strict host key checking. */
58 int compression; /* Compress packets in both directions. */
59 int compression_level; /* Compression level 1 (fast) to 9
60 * (best). */
61 int tcp_keep_alive; /* Set SO_KEEPALIVE. */
62 int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */
63 int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */
62 LogLevel log_level; /* Level for logging. */
63
64 int port; /* Port to connect. */
65 int address_family;
66 int connection_attempts; /* Max attempts (seconds) before
67 * giving up */
68 int connection_timeout; /* Max time (seconds) before
69 * aborting connection attempt */
70 int number_of_password_prompts; /* Max number of password
71 * prompts. */
72 int cipher; /* Cipher to use. */
73 char *ciphers; /* SSH2 ciphers in order of preference. */
74 char *macs; /* SSH2 macs in order of preference. */
75 char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */
64 LogLevel log_level; /* Level for logging. */
65
66 int port; /* Port to connect. */
67 int address_family;
68 int connection_attempts; /* Max attempts (seconds) before
69 * giving up */
70 int connection_timeout; /* Max time (seconds) before
71 * aborting connection attempt */
72 int number_of_password_prompts; /* Max number of password
73 * prompts. */
74 int cipher; /* Cipher to use. */
75 char *ciphers; /* SSH2 ciphers in order of preference. */
76 char *macs; /* SSH2 macs in order of preference. */
77 char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */
78 char *kex_algorithms; /* SSH2 kex methods in order of preference. */
76 int protocol; /* Protocol in order of preference. */
77 char *hostname; /* Real host to connect. */
78 char *host_key_alias; /* hostname alias for .ssh/known_hosts */
79 char *proxy_command; /* Proxy command for connecting the host. */
80 char *user; /* User to log in as. */
81 int escape_char; /* Escape character; -2 = none */
82
83 char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */

--- 68 unchanged lines hidden ---
79 int protocol; /* Protocol in order of preference. */
80 char *hostname; /* Real host to connect. */
81 char *host_key_alias; /* hostname alias for .ssh/known_hosts */
82 char *proxy_command; /* Proxy command for connecting the host. */
83 char *user; /* User to log in as. */
84 int escape_char; /* Escape character; -2 = none */
85
86 char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */

--- 68 unchanged lines hidden ---