diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-10-29 14:05:21 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-10-29 14:05:21 +0000 |
| commit | d5fac75667ae208bb9e2b8290276a43d4fd359a6 (patch) | |
| tree | bff6acf557666bdc9c579ac5c98ba44fc8a3b89c | |
| parent | 20e89605c905baef50f0dd4d7d4901190173292f (diff) | |
| parent | b33a302235affc19d8a1d8f7473fe589d1bcd17e (diff) | |
| download | rtmux-d5fac75667ae208bb9e2b8290276a43d4fd359a6.tar.gz rtmux-d5fac75667ae208bb9e2b8290276a43d4fd359a6.tar.bz2 rtmux-d5fac75667ae208bb9e2b8290276a43d4fd359a6.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | server-client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index 62281c83..d6777113 100644 --- a/server-client.c +++ b/server-client.c @@ -2245,7 +2245,7 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg) c->fd = open(c->ttyname, O_RDWR|O_NOCTTY); #endif - if (c->flags & CLIENT_CONTROL) + if (c->flags & CLIENT_CONTROL) control_start(c); else if (c->fd != -1) { if (tty_init(&c->tty, c) != 0) { @@ -2260,13 +2260,13 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg) } /* - * If this is the first client that has finished identifying, load - * configuration files. + * If this is the first client, load configuration files. Any later + * clients are allowed to continue with their command even if the + * config has not been loaded - they might have been run from inside it */ if ((~c->flags & CLIENT_EXIT) && - !cfg_finished && - c == TAILQ_FIRST(&clients) && - TAILQ_NEXT(c, entry) == NULL) + !cfg_finished && + c == TAILQ_FIRST(&clients)) start_cfg(); } |