[openssh-commits] [openssh] branch master updated (5cefe76 -> f9eca24)

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a change to branch master
in repository openssh.

      from  5cefe76   upstream commit
       new  f9eca24   upstream commit

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit f9eca249d4961f28ae4b09186d7dc91de74b5895
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Jul 30 00:01:34 2015 +0000

    upstream commit
    
    Allow ssh_config and sshd_config kex parameters options be
     prefixed by a '+' to indicate that the specified items be appended to the
     default rather than replacing it.
    
    approach suggested by dtucker@, feedback dlg@, ok markus@
    
    Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a

Summary of changes:
 kex.c         | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 kex.h         |  4 +++-
 readconf.c    | 25 ++++++++++++-----------
 servconf.c    | 24 +++++++++++++---------
 ssh.c         | 35 ++++++++++++++++----------------
 ssh_config.5  | 31 +++++++++++++++++++++++++++--
 sshconnect2.c | 33 +++++++++++-------------------
 sshd.c        | 29 ++++++++++-----------------
 sshd_config.5 | 26 ++++++++++++++++++++++--
 9 files changed, 187 insertions(+), 84 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.