===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -c -r1.63 -r1.64
*** src/usr.bin/tmux/server.c	2009/10/27 13:03:33	1.63
--- src/usr.bin/tmux/server.c	2009/11/02 12:48:44	1.64
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.63 2009/10/27 13:03:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.64 2009/11/02 12:48:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 272,285 ****
  	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);
  			goto error;
! 		}
! 	} else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
  		goto error;
  	if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
  		goto error;
  
--- 272,284 ----
  	srv_fd = server_create_socket();
  	server_client_create(pair[1]);
  
! 	if (access(SYSTEM_CFG, R_OK) == 0) {
! 		if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
  			goto error;
! 	} 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;