upstream: channel_new no longer frees remote_name. So update the

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

OpenBSD-Commit-ID: e4e10dc8dc9f40c166ea5a8e991942bedc75a76a

diff --git a/channels.c b/channels.c
index 8a8a2c7eb5b60121f3adcb5d6148449d2cd9caf5..3ac51bac2c7a69d1a766228f6c65bb43ec2fb794 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -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>
  * 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
- * remote_name to be freed.
+ * Allocate a new channel object and set its type and socket.
  */
 Channel *
 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;
        u_int i, found;

diff --git a/channels.h b/channels.h
index dfb82f8ce2627f23854ff8227537b72c6f9cf648..828c1b61b44310c8722c36c63ff2cd055aa53f15 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -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>
@@ -275,7 +275,7 @@ Channel     *channel_by_id(struct ssh *, int);
 Channel        *channel_by_remote_id(struct ssh *, u_int);
 Channel        *channel_lookup(struct ssh *, 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,
            int, int, u_int);
 void    channel_free(struct ssh *, Channel *);