===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- src/usr.bin/tmux/tmux.c	2012/07/10 11:53:01	1.112
+++ src/usr.bin/tmux/tmux.c	2012/11/26 11:35:28	1.113
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.112 2012/07/10 11:53:01 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.113 2012/11/26 11:35:28 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -159,7 +159,7 @@
 char *
 makesocketpath(const char *label)
 {
-	char		base[MAXPATHLEN], *path, *s;
+	char		base[MAXPATHLEN], realbase[MAXPATHLEN], *path, *s;
 	struct stat	sb;
 	u_int		uid;
 
@@ -183,7 +183,10 @@
 		return (NULL);
 	}
 
-	xasprintf(&path, "%s/%s", base, label);
+	if (realpath(base, realbase) == NULL)
+		strlcpy(realbase, base, sizeof realbase);
+
+	xasprintf(&path, "%s/%s", realbase, label);
 	return (path);
 }
 
@@ -384,8 +387,7 @@
 		}
 	}
 	free(label);
-	if (realpath(path, socket_path) == NULL)
-		strlcpy(socket_path, path, sizeof socket_path);
+	strlcpy(socket_path, path, sizeof socket_path);
 	free(path);
 
 	/* Set process title. */