tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: channel_new no longer frees remote_name. So update the

Browse Source 
comment accordingly.  As remote_name is not modified, it can be const as
well. From Martin Vahlensieck

OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a
This commit is contained in:
djm@openbsd.org 2022-05-05 00:56:58 +00:00 committed by Damien Miller
parent 37b62fd5ca
commit 0e44db4d9c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.418 2022/05/04 07:31:22 markus Exp $ */ /* $OpenBSD: channels.c,v 1.419 2022/05/05 00:56:58 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -361,12 +361,12 @@ channel_register_fds(struct ssh *ssh, Channel *c, int rfd, int wfd, int efd,
} }
/* /*
* Allocate a new channel object and set its type and socket. This will cause * Allocate a new channel object and set its type and socket.
* remote_name to be freed.
*/ */
Channel * Channel *
channel_new(struct ssh *ssh, char *ctype, int type, int rfd, int wfd, int efd, channel_new(struct ssh *ssh, char *ctype, int type, int rfd, int wfd, int efd,
u_int window, u_int maxpack, int extusage, char *remote_name, int nonblock) u_int window, u_int maxpack, int extusage, const char *remote_name,
int nonblock)
{ {
struct ssh_channels *sc = ssh->chanctxt; struct ssh_channels *sc = ssh->chanctxt;
u_int i, found; u_int i, found;

4
channels.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.h,v 1.142 2022/03/30 21:10:25 djm Exp $ */ /* $OpenBSD: channels.h,v 1.143 2022/05/05 00:56:58 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -275,7 +275,7 @@ Channel *channel_by_id(struct ssh *, int);
Channel *channel_by_remote_id(struct ssh *, u_int); Channel *channel_by_remote_id(struct ssh *, u_int);
Channel *channel_lookup(struct ssh *, int); Channel *channel_lookup(struct ssh *, int);
Channel *channel_new(struct ssh *, char *, int, int, int, int, Channel *channel_new(struct ssh *, char *, int, int, int, int,
u_int, u_int, int, char *, int); u_int, u_int, int, const char *, int);
void channel_set_fds(struct ssh *, int, int, int, int, int, void channel_set_fds(struct ssh *, int, int, int, int, int,
int, int, u_int); int, int, u_int);
void channel_free(struct ssh *, Channel *); void channel_free(struct ssh *, Channel *);