RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: fix some over-long lines and __func__ up some debug 

messages

OpenBSD-Commit-ID: c70a60b4c8207d9f242fc2351941ba50916bb267
This commit is contained in:
djm@openbsd.org 2018-06-08 01:55:40 +00:00 committed by Damien Miller
parent 6ff6fda705
commit 027607fc2d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
serverloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: serverloop.c,v 1.205 2018/03/03 03:15:51 djm Exp $ */ /* $OpenBSD: serverloop.c,v 1.206 2018/06/08 01:55:40 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
@ -145,7 +145,7 @@ notify_done(fd_set *readset)
if (notify_pipe[0] != -1 && FD_ISSET(notify_pipe[0], readset)) if (notify_pipe[0] != -1 && FD_ISSET(notify_pipe[0], readset))
while (read(notify_pipe[0], &c, 1) != -1) while (read(notify_pipe[0], &c, 1) != -1)
debug2("notify_done: reading"); debug2("%s: reading", __func__);
} }
/*ARGSUSED*/ /*ARGSUSED*/
@ -623,7 +623,7 @@ server_input_channel_open(int type, u_int32_t seq, struct ssh *ssh)
rwindow = packet_get_int(); rwindow = packet_get_int();
rmaxpack = packet_get_int(); rmaxpack = packet_get_int();
debug("server_input_channel_open: ctype %s rchan %d win %d max %d", debug("%s: ctype %s rchan %d win %d max %d", __func__,
ctype, rchan, rwindow, rmaxpack); ctype, rchan, rwindow, rmaxpack);
if (strcmp(ctype, "session") == 0) { if (strcmp(ctype, "session") == 0) {
@ -636,7 +636,7 @@ server_input_channel_open(int type, u_int32_t seq, struct ssh *ssh)
c = server_request_tun(ssh); c = server_request_tun(ssh);
} }
if (c != NULL) { if (c != NULL) {
debug("server_input_channel_open: confirm %s", ctype); debug("%s: confirm %s", __func__, ctype);
c->remote_id = rchan; c->remote_id = rchan;
c->have_remote_id = 1; c->have_remote_id = 1;
c->remote_window = rwindow; c->remote_window = rwindow;
@ -650,7 +650,7 @@ server_input_channel_open(int type, u_int32_t seq, struct ssh *ssh)
packet_send(); packet_send();
} }
} else { } else {
debug("server_input_channel_open: failure %s", ctype); debug("%s: failure %s", __func__, ctype);
packet_start(SSH2_MSG_CHANNEL_OPEN_FAILURE); packet_start(SSH2_MSG_CHANNEL_OPEN_FAILURE);
packet_put_int(rchan); packet_put_int(rchan);
packet_put_int(reason); packet_put_int(reason);
@ -750,11 +750,11 @@ server_input_global_request(int type, u_int32_t seq, struct ssh *ssh)
struct passwd *pw = the_authctxt->pw; struct passwd *pw = the_authctxt->pw;
if (pw == NULL || !the_authctxt->valid) if (pw == NULL || !the_authctxt->valid)
fatal("server_input_global_request: no/invalid user"); fatal("%s: no/invalid user", __func__);
rtype = packet_get_string(NULL); rtype = packet_get_string(NULL);
want_reply = packet_get_char(); want_reply = packet_get_char();
debug("server_input_global_request: rtype %s want_reply %d", rtype, want_reply); debug("%s: rtype %s want_reply %d", __func__, rtype, want_reply);
/* -R style forwarding */ /* -R style forwarding */
if (strcmp(rtype, "tcpip-forward") == 0) { if (strcmp(rtype, "tcpip-forward") == 0) {
@ -763,7 +763,7 @@ server_input_global_request(int type, u_int32_t seq, struct ssh *ssh)
memset(&fwd, 0, sizeof(fwd)); memset(&fwd, 0, sizeof(fwd));
fwd.listen_host = packet_get_string(NULL); fwd.listen_host = packet_get_string(NULL);
fwd.listen_port = (u_short)packet_get_int(); fwd.listen_port = (u_short)packet_get_int();
debug("server_input_global_request: tcpip-forward listen %s port %d", debug("%s: tcpip-forward listen %s port %d", __func__,
fwd.listen_host, fwd.listen_port); fwd.listen_host, fwd.listen_port);
/* check permissions */ /* check permissions */
@ -802,7 +802,7 @@ server_input_global_request(int type, u_int32_t seq, struct ssh *ssh)
memset(&fwd, 0, sizeof(fwd)); memset(&fwd, 0, sizeof(fwd));
fwd.listen_path = packet_get_string(NULL); fwd.listen_path = packet_get_string(NULL);
debug("server_input_global_request: streamlocal-forward listen path %s", debug("%s: streamlocal-forward listen path %s", __func__,
fwd.listen_path); fwd.listen_path);
/* check permissions */ /* check permissions */