Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-05-03 23:02:28 +01:00
11 changed files with 146 additions and 35 deletions

View File

@ -440,7 +440,6 @@ server_check_unattached(void)
}
}
/* Set stdin callback. */
int
server_set_stdin_callback(struct client *c, void (*cb)(struct client *, int,
void *), void *cb_data, char **cause)
@ -454,7 +453,7 @@ server_set_stdin_callback(struct client *c, void (*cb)(struct client *, int,
return (-1);
}
if (c->stdin_callback != NULL) {
*cause = xstrdup("stdin in use");
*cause = xstrdup("stdin is in use");
return (-1);
}