aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-08-23 17:29:51 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-08-23 17:29:51 +0000
commitc7394ac4e0f7e6e034fbb4b050de6f713bb9f6e0 (patch)
tree5922399cc29cc65877260b5bfc36ba0b1cfafbc4 /server.c
parent43cd40e87a41d9504dcac99419c96e3cdbb81029 (diff)
downloadrtmux-c7394ac4e0f7e6e034fbb4b050de6f713bb9f6e0.tar.gz
rtmux-c7394ac4e0f7e6e034fbb4b050de6f713bb9f6e0.tar.bz2
rtmux-c7394ac4e0f7e6e034fbb4b050de6f713bb9f6e0.zip
When using source-file, run the commands in the context of the source-file
command rather than with no context. This makes things like attach work from a file.
Diffstat (limited to 'server.c')
-rw-r--r--server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server.c b/server.c
index 707b4e49..3f15ca41 100644
--- a/server.c
+++ b/server.c
@@ -188,9 +188,9 @@ server_start(char *path)
&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
goto error;
}
- } else if (load_cfg(SYSTEM_CFG, &cause) != 0)
+ } else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
goto error;
- if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0)
+ if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
goto error;
exit(server_main(srv_fd));