62c62
< RCSID("$OpenBSD: clientloop.c,v 1.107 2003/04/01 10:22:21 markus Exp $");
---
> RCSID("$OpenBSD: clientloop.c,v 1.112 2003/06/28 16:23:06 deraadt Exp $");
398c398
< atomicio(write, fileno(stdout), buffer_ptr(bout), buffer_len(bout));
---
> atomicio(vwrite, fileno(stdout), buffer_ptr(bout), buffer_len(bout));
400c400
< atomicio(write, fileno(stderr), buffer_ptr(berr), buffer_len(berr));
---
> atomicio(vwrite, fileno(stderr), buffer_ptr(berr), buffer_len(berr));
493c493
< log("Invalid command.");
---
> logit("Invalid command.");
499c499
< log("Not supported for SSH protocol version 1.");
---
> logit("Not supported for SSH protocol version 1.");
510c510
< log("Bad forwarding specification.");
---
> logit("Bad forwarding specification.");
515c515
< log("Bad forwarding port(s).");
---
> logit("Bad forwarding port(s).");
521c521
< log("Port forwarding failed.");
---
> logit("Port forwarding failed.");
527c527
< log("Forwarding port.");
---
> logit("Forwarding port.");
576a577,589
> case 'B':
> if (compat20) {
> snprintf(string, sizeof string,
> "%cB\r\n", escape_char);
> buffer_append(berr, string,
> strlen(string));
> channel_request_start(session_ident,
> "break", 0);
> packet_put_int(1000);
> packet_send();
> }
> continue;
>
580c593
< log("Server does not support re-keying");
---
> logit("Server does not support re-keying");
638a652
> %cB - send a BREAK to the remote system\r\n\
649c663
< escape_char, escape_char);
---
> escape_char, escape_char, escape_char);
971,973c985,986
<
< if (need_rekeying) {
< debug("user requests rekeying");
---
> if (need_rekeying || packet_need_rekeying()) {
> debug("need rekeying");
1149c1162
< xstrdup(originator_address), 1);
---
> originator_address, 1);
1185,1186c1198
< CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0,
< xstrdup("x11"), 1);
---
> CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1);
1208c1220
< xstrdup("authentication agent connection"), 1);
---
> "authentication agent connection", 1);