===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -c -r1.145 -r1.146
*** src/usr.bin/tmux/tmux.c	2015/10/23 16:07:29	1.145
--- src/usr.bin/tmux/tmux.c	2015/10/25 07:48:16	1.146
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.145 2015/10/23 16:07:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.146 2015/10/25 07:48:16 deraadt Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 127,134 ****
  
  	uid = getuid();
  	if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0')
- 		xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid);
- 	else if ((s = getenv("TMPDIR")) != NULL && *s != '\0')
  		xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid);
  	else
  		xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid);
--- 127,132 ----