diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 14:56:29 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 14:56:29 +0100 |
commit | 978e62d6f14c60747bddef2cc72d66a9c8b83b54 (patch) | |
tree | 89400a44e42d84937deba7864e4964d6c7734da5 /readconf.h | |
parent | 87c685b8c6a49814fd782288097b3093f975aa72 (diff) | |
parent | 3a7e89697ca363de0f64e0d5704c57219294e41c (diff) |
* New upstream release (http://www.openssh.org/txt/release-5.9).
- Introduce sandboxing of the pre-auth privsep child using an optional
sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
mandatory restrictions on the syscalls the privsep child can perform.
- Add new SHA256-based HMAC transport integrity modes from
http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
- The pre-authentication sshd(8) privilege separation slave process now
logs via a socket shared with the master process, avoiding the need to
maintain /dev/log inside the chroot (closes: #75043, #429243,
#599240).
- ssh(1) now warns when a server refuses X11 forwarding (closes:
#504757).
- sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
separated by whitespace (closes: #76312). The authorized_keys2
fallback is deprecated but documented (closes: #560156).
- ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
ToS/DSCP (closes: #498297).
- ssh-add(1) now accepts keys piped from standard input. E.g. "ssh-add
- < /path/to/key" (closes: #229124).
- Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
- Say "required" rather than "recommended" in unprotected-private-key
warning (LP: #663455).
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/readconf.h b/readconf.h index c4391abe4..2d9005ffa 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.90 2011/05/24 07:15:47 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -27,7 +27,8 @@ typedef struct { | |||
27 | } Forward; | 27 | } Forward; |
28 | /* Data structure for representing option data. */ | 28 | /* Data structure for representing option data. */ |
29 | 29 | ||
30 | #define MAX_SEND_ENV 256 | 30 | #define MAX_SEND_ENV 256 |
31 | #define SSH_MAX_HOSTS_FILES 256 | ||
31 | 32 | ||
32 | typedef struct { | 33 | typedef struct { |
33 | int forward_agent; /* Forward authentication agent. */ | 34 | int forward_agent; /* Forward authentication agent. */ |
@@ -89,10 +90,10 @@ typedef struct { | |||
89 | char *user; /* User to log in as. */ | 90 | char *user; /* User to log in as. */ |
90 | int escape_char; /* Escape character; -2 = none */ | 91 | int escape_char; /* Escape character; -2 = none */ |
91 | 92 | ||
92 | char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */ | 93 | u_int num_system_hostfiles; /* Paths for /etc/ssh/ssh_known_hosts */ |
93 | char *user_hostfile; /* Path for $HOME/.ssh/known_hosts. */ | 94 | char *system_hostfiles[SSH_MAX_HOSTS_FILES]; |
94 | char *system_hostfile2; | 95 | u_int num_user_hostfiles; /* Path for $HOME/.ssh/known_hosts */ |
95 | char *user_hostfile2; | 96 | char *user_hostfiles[SSH_MAX_HOSTS_FILES]; |
96 | char *preferred_authentications; | 97 | char *preferred_authentications; |
97 | char *bind_address; /* local socket address for connection to sshd */ | 98 | char *bind_address; /* local socket address for connection to sshd */ |
98 | char *pkcs11_provider; /* PKCS#11 provider */ | 99 | char *pkcs11_provider; /* PKCS#11 provider */ |
@@ -138,6 +139,7 @@ typedef struct { | |||
138 | 139 | ||
139 | int use_roaming; | 140 | int use_roaming; |
140 | 141 | ||
142 | int request_tty; | ||
141 | } Options; | 143 | } Options; |
142 | 144 | ||
143 | #define SSHCTL_MASTER_NO 0 | 145 | #define SSHCTL_MASTER_NO 0 |
@@ -146,6 +148,11 @@ typedef struct { | |||
146 | #define SSHCTL_MASTER_ASK 3 | 148 | #define SSHCTL_MASTER_ASK 3 |
147 | #define SSHCTL_MASTER_AUTO_ASK 4 | 149 | #define SSHCTL_MASTER_AUTO_ASK 4 |
148 | 150 | ||
151 | #define REQUEST_TTY_AUTO 0 | ||
152 | #define REQUEST_TTY_NO 1 | ||
153 | #define REQUEST_TTY_YES 2 | ||
154 | #define REQUEST_TTY_FORCE 3 | ||
155 | |||
149 | void initialize_options(Options *); | 156 | void initialize_options(Options *); |
150 | void fill_default_options(Options *); | 157 | void fill_default_options(Options *); |
151 | int read_config_file(const char *, const char *, Options *, int); | 158 | int read_config_file(const char *, const char *, Options *, int); |