aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2012-12-08 20:29:37 +0000
committerThomas Adam <thomas@xteddy.org>2012-12-08 20:29:37 +0000
commitfb83914bd745996429374122f2289f2930170f71 (patch)
tree17e80c94f1605da8eebb6565244baee0cedb82d7 /server.c
parentd5de489dc4ae2e5eaa9e5dee86094afb43cc1387 (diff)
parent3fa4f691e32482b2d07d16be84b6e22657f9c7dd (diff)
downloadrtmux-fb83914bd745996429374122f2289f2930170f71.tar.gz
rtmux-fb83914bd745996429374122f2289f2930170f71.tar.bz2
rtmux-fb83914bd745996429374122f2289f2930170f71.zip
Merge branch 'obsd-master'
Sync from OpenBSD.
Diffstat (limited to 'server.c')
-rw-r--r--server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/server.c b/server.c
index 033707eb..b5139b4f 100644
--- a/server.c
+++ b/server.c
@@ -167,7 +167,7 @@ server_start(int lockfd, char *lockfile)
load_cfg(SYSTEM_CFG, NULL, &cfg_causes);
else if (errno != ENOENT) {
cfg_add_cause(
- &cfg_causes, "%s: %s", strerror(errno), SYSTEM_CFG);
+ &cfg_causes, "%s: %s", SYSTEM_CFG, strerror(errno));
}
if (cfg_file != NULL)
load_cfg(cfg_file, NULL, &cfg_causes);