diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-24 16:27:03 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-24 16:27:03 +0000 |
| commit | 35b926c4459df017cd9b08611a1b8e11e0eb425f (patch) | |
| tree | 01a77a07d12b41c47bfb7082a54d4d9279c9f27a /server.c | |
| parent | 2e2e762743417ae7a0c32a4b40909ecdf3bb3560 (diff) | |
| download | rtmux-35b926c4459df017cd9b08611a1b8e11e0eb425f.tar.gz rtmux-35b926c4459df017cd9b08611a1b8e11e0eb425f.tar.bz2 rtmux-35b926c4459df017cd9b08611a1b8e11e0eb425f.zip | |
Sync OpenBSD patchset 290:
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.174 2009-08-20 11:45:37 tcunha Exp $ */ +/* $Id: server.c,v 1.175 2009-08-24 16:27:03 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -191,9 +191,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)); |