[openssh-commits] [openssh] 07/07: upstream commit

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit c7219f4f54d64d6dde66dbcf7a2699daa782d2a1
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Dec 12 00:02:17 2014 +0000

    upstream commit
    
    revert chunk I didn't mean to commit yet; via jmc@
---
 sshd_config.5 | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/sshd_config.5 b/sshd_config.5
index 9f52cf4..ef36d33 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.181 2014/12/11 05:25:06 djm Exp $
-.Dd $Mdocdate: December 11 2014 $
+.\" $OpenBSD: sshd_config.5,v 1.182 2014/12/12 00:02:17 djm Exp $
+.Dd $Mdocdate: December 12 2014 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -210,18 +210,6 @@ would restrict keyboard interactive authentication to the
 .Dq bsdauth
 device.
 .Pp
-If the
-.Dq publickey
-method is listed more than one,
-.Xr sshd 8
-verifies that keys that have been successfully are not reused for subsequent
-authentications.
-For example, an
-.Cm AuthenticationMethods
-of
-.Dq publickey,publickey
-will require successful authentication using two different public keys.
-.Pp
 This option is only available for SSH protocol 2 and will yield a fatal
 error if enabled if protocol 1 is also enabled.
 Note that each authentication method listed should also be explicitly enabled

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