From 22355ce947da7acd8863d7f7a467324ad030faec Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Sun, 12 Jul 2009 16:07:56 +0000
Subject: If it exist, load a system-wide configuration file /etc/tmux.conf
 before any user-specified one.

---
 server.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'server.c')

diff --git a/server.c b/server.c
index 6ba83d87..e9986a72 100644
--- a/server.c
+++ b/server.c
@@ -171,6 +171,17 @@ server_start(char *path)
 	start_time = time(NULL);
 	socket_path = path;
 
+	if (access(SYSTEM_CFG, R_OK) != 0) {
+		if (errno != ENOENT) {
+			log_warn("%s", SYSTEM_CFG);
+			exit(1);
+		}
+	} else {
+		if (load_cfg(SYSTEM_CFG, &cause) != 0) {
+			log_warnx("%s", cause);
+			exit(1);
+		}
+	}
 	if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0) {
 		log_warnx("%s", cause);
 		exit(1);
-- 
cgit