Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-02-16 14:02:37 +00:00
3 changed files with 5 additions and 1 deletions

View File

@ -1996,6 +1996,8 @@ server_client_get_cwd(struct client *c, struct session *s)
{
const char *home;
if (!cfg_finished && cfg_client != NULL)
return (cfg_client->cwd);
if (c != NULL && c->session == NULL && c->cwd != NULL)
return (c->cwd);
if (s != NULL && s->cwd != NULL)