From ee1cc9f415ff4345577b75c750f71ab4589f97c1 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Mon, 2 Nov 2009 21:39:34 +0000
Subject: [PATCH] Sync OpenBSD patchset 476:

Reorder slightly to tidy code.
---
 server.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/server.c b/server.c
index faf9096b..bea6f5d7 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.214 2009-10-28 23:14:15 tcunha Exp $ */
+/* $Id: server.c,v 1.215 2009-11-02 21:39:34 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -275,14 +275,13 @@ server_start(char *path)
 	srv_fd = server_create_socket();
 	server_client_create(pair[1]);
 
-	if (access(SYSTEM_CFG, R_OK) != 0) {
-		if (errno != ENOENT) {
-			xasprintf(
-			    &cause, "%s: %s", strerror(errno), SYSTEM_CFG);
+	if (access(SYSTEM_CFG, R_OK) == 0) {
+		if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
 			goto error;
-		}
-	} else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
+	} else if (errno != ENOENT) {
+		xasprintf(&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
 		goto error;
+	}
 	if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
 		goto error;