From: djm <djm@openbsd.org>
Date: Thu, 5 May 2022 00:56:58 +0000 (+0000)
Subject: channel_new no longer frees remote_name.  So update the comment
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=287a191854ace126112c6d304bbf8a1a593b55da;p=openbsd

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
---

diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 65ea5d4d0f2..57b641cc4fa 100644
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/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
@@ -349,12 +349,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/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h
index 871fda0a8f4..18961014307 100644
--- a/usr.bin/ssh/channels.h
+++ b/usr.bin/ssh/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>
@@ -272,7 +272,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 *);