Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-19 10:01:12 +01:00
5 changed files with 76 additions and 6 deletions

View File

@ -1174,7 +1174,9 @@ format_defaults_client(struct format_tree *ft, struct client *c)
format_add_tv(ft, "client_created", &c->creation_time);
format_add_tv(ft, "client_activity", &c->activity_time);
format_add(ft, "client_written", "%zu", tty->written);
format_add(ft, "client_written", "%zu", c->written);
format_add(ft, "client_discarded", "%zu", c->discarded);
name = server_client_get_key_table(c);
if (strcmp(c->keytable->name, name) == 0)