* 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).

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 @@
-/* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.90 2011/05/24 07:15:47 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -27,7 +27,8 @@ typedef struct {
 }       Forward;
 /* Data structure for representing option data. */
 
-#define MAX_SEND_ENV    256
+#define MAX_SEND_ENV            256
+#define SSH_MAX_HOSTS_FILES     256
 
 typedef struct {
         int     forward_agent;  /* Forward authentication agent. */
@@ -89,10 +90,10 @@ typedef struct {
         char   *user;           /* User to log in as. */
         int     escape_char;    /* Escape character; -2 = none */
 
-        char   *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */
-        char   *user_hostfile;  /* Path for $HOME/.ssh/known_hosts. */
-        char   *system_hostfile2;
-        char   *user_hostfile2;
+        u_int   num_system_hostfiles;   /* Paths for /etc/ssh/ssh_known_hosts */
+        char   *system_hostfiles[SSH_MAX_HOSTS_FILES];
+        u_int   num_user_hostfiles;     /* Path for $HOME/.ssh/known_hosts */
+        char   *user_hostfiles[SSH_MAX_HOSTS_FILES];
         char   *preferred_authentications;
         char   *bind_address;   /* local socket address for connection to sshd */
         char   *pkcs11_provider; /* PKCS#11 provider */
@@ -138,6 +139,7 @@ typedef struct {
 
         int     use_roaming;
 
+        int     request_tty;
 }       Options;
 
 #define SSHCTL_MASTER_NO        0
@@ -146,6 +148,11 @@ typedef struct {
 #define SSHCTL_MASTER_ASK       3
 #define SSHCTL_MASTER_AUTO_ASK  4
 
+#define REQUEST_TTY_AUTO        0
+#define REQUEST_TTY_NO          1
+#define REQUEST_TTY_YES         2
+#define REQUEST_TTY_FORCE       3
+
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int      read_config_file(const char *, const char *, Options *, int);