===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- src/usr.bin/tmux/server.c	2011/03/27 20:27:26	1.102
+++ src/usr.bin/tmux/server.c	2012/03/09 09:57:40	1.103
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.102 2011/03/27 20:27:26 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.103 2012/03/09 09:57:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -104,7 +104,7 @@
 
 /* Fork new server. */
 int
-server_start(void)
+server_start(int lockfd, char *lockfile)
 {
 	struct window_pane	*wp;
 	int	 		 pair[2];
@@ -160,6 +160,10 @@
 
 	server_fd = server_create_socket();
 	server_client_create(pair[1]);
+
+	unlink(lockfile);
+	xfree(lockfile);
+	close(lockfd);
 
 	if (access(SYSTEM_CFG, R_OK) == 0)
 		load_cfg(SYSTEM_CFG, NULL, &cfg_causes);