summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-14 13:45:42 +1000
committerDamien Miller <djm@mindrot.org>2003-05-14 13:45:42 +1000
commitb1ca8bb159bba7cedebe8fa467bf29e4ab1a65be (patch)
treebfd881a8f80929bb17f02aafe58e275bacfeb0de /serverloop.c
parentdb2747259c1a433a504085f733768d0d209eb50d (diff)
- markus@cvs.openbsd.org 2003/05/11 20:30:25
[channels.c clientloop.c serverloop.c session.c ssh.c] make channel_new() strdup the 'remote_name' (not the caller); ok theo
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c
index 187afc716..39c2a488c 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.107 2003/04/02 09:48:07 markus Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.108 2003/05/11 20:30:24 markus Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
@@ -880,7 +880,7 @@ server_request_direct_tcpip(char *ctype)
880 return NULL; 880 return NULL;
881 c = channel_new(ctype, SSH_CHANNEL_CONNECTING, 881 c = channel_new(ctype, SSH_CHANNEL_CONNECTING,
882 sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, 882 sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT,
883 CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip"), 1); 883 CHAN_TCP_PACKET_DEFAULT, 0, "direct-tcpip", 1);
884 return c; 884 return c;
885} 885}
886 886
@@ -899,7 +899,7 @@ server_request_session(char *ctype)
899 */ 899 */
900 c = channel_new(ctype, SSH_CHANNEL_LARVAL, 900 c = channel_new(ctype, SSH_CHANNEL_LARVAL,
901 -1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT, 901 -1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT,
902 0, xstrdup("server-session"), 1); 902 0, "server-session", 1);
903 if (session_open(xxx_authctxt, c->self) != 1) { 903 if (session_open(xxx_authctxt, c->self) != 1) {
904 debug("session open failed, free channel %d", c->self); 904 debug("session open failed, free channel %d", c->self);
905 channel_free(c); 905 channel_free(c);