[openssh-commits] [openssh] 02/20: 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 c221219b1fbee47028dcaf66613f4f8d6b7640e9
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Tue May 30 08:49:58 2017 +0000

    upstream commit
    
    remove ssh1 references; ok djm@
    
    Upstream-ID: fc23b7578e7b0a8daaec72946d7f5e58ffff5a3d
---
 auth2-chall.c | 2 +-
 channels.c    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/auth2-chall.c b/auth2-chall.c
index ead48031..4be42128 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.44 2016/05/02 08:49:03 djm Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.45 2017/05/30 08:49:58 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
diff --git a/channels.c b/channels.c
index 5802c162..e7de370d 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.361 2017/05/26 19:35:50 markus Exp $ */
+/* $OpenBSD: channels.c,v 1.362 2017/05/30 08:49:58 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -3191,7 +3191,7 @@ channel_cancel_lport_listener(struct Forward *fwd, int cport, struct ForwardOpti
 		return channel_cancel_lport_listener_tcpip(fwd->listen_host, fwd->listen_port, cport, fwd_opts);
 }
 
-/* protocol local port fwd, used by ssh (and sshd in v1) */
+/* protocol local port fwd, used by ssh */
 int
 channel_setup_local_fwd_listener(struct Forward *fwd, struct ForwardOptions *fwd_opts)
 {

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