diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 08:49:58 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:46:44 +1000 |
commit | c221219b1fbee47028dcaf66613f4f8d6b7640e9 (patch) | |
tree | 9b84695403584a5b1c1398e9d5c78cfc1aae26cc | |
parent | afbfa68fa18081ef05a9cd294958509a5d3cda8b (diff) |
upstream commit
remove ssh1 references; ok djm@
Upstream-ID: fc23b7578e7b0a8daaec72946d7f5e58ffff5a3d
-rw-r--r-- | auth2-chall.c | 2 | ||||
-rw-r--r-- | channels.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/auth2-chall.c b/auth2-chall.c index ead480318..4be421287 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-chall.c,v 1.44 2016/05/02 08:49:03 djm Exp $ */ | 1 | /* $OpenBSD: auth2-chall.c,v 1.45 2017/05/30 08:49:58 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2001 Per Allansson. All rights reserved. | 4 | * Copyright (c) 2001 Per Allansson. All rights reserved. |
diff --git a/channels.c b/channels.c index 5802c162e..e7de370d4 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.361 2017/05/26 19:35:50 markus Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.362 2017/05/30 08:49:58 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -3191,7 +3191,7 @@ channel_cancel_lport_listener(struct Forward *fwd, int cport, struct ForwardOpti | |||
3191 | return channel_cancel_lport_listener_tcpip(fwd->listen_host, fwd->listen_port, cport, fwd_opts); | 3191 | return channel_cancel_lport_listener_tcpip(fwd->listen_host, fwd->listen_port, cport, fwd_opts); |
3192 | } | 3192 | } |
3193 | 3193 | ||
3194 | /* protocol local port fwd, used by ssh (and sshd in v1) */ | 3194 | /* protocol local port fwd, used by ssh */ |
3195 | int | 3195 | int |
3196 | channel_setup_local_fwd_listener(struct Forward *fwd, struct ForwardOptions *fwd_opts) | 3196 | channel_setup_local_fwd_listener(struct Forward *fwd, struct ForwardOptions *fwd_opts) |
3197 | { | 3197 | { |