diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-10-01 23:50:24 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-10-01 23:50:24 +0100 |
| commit | 13360ad54157790cbbaab757f659cb6d8a4ce2c4 (patch) | |
| tree | 848e4df56152b0cd46fd3c855b95394bf4b815a4 /tmux.c | |
| parent | 9389cfbec9d7f4a7b5f9d4a580428949db4f6e67 (diff) | |
| parent | 7be152412ea0a614df11bce9ba5097574369a5f6 (diff) | |
| download | rtmux-13360ad54157790cbbaab757f659cb6d8a4ce2c4.tar.gz rtmux-13360ad54157790cbbaab757f659cb6d8a4ce2c4.tar.bz2 rtmux-13360ad54157790cbbaab757f659cb6d8a4ce2c4.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -184,7 +184,8 @@ makesocketpath(const char *label) errno = ENOTDIR; return (NULL); } - if (sb.st_uid != uid || (sb.st_mode & (S_IRWXG|S_IRWXO)) != 0) { + if (sb.st_uid != uid || (!S_ISDIR(sb.st_mode) && + sb.st_mode & (S_IRWXG|S_IRWXO)) != 0) { errno = EACCES; return (NULL); } @@ -387,7 +388,8 @@ main(int argc, char **argv) /* -L or default set. */ if (label != NULL) { if ((path = makesocketpath(label)) == NULL) { - fprintf(stderr, "can't create socket\n"); + fprintf(stderr, "can't create socket: %s\n", + strerror(errno)); exit(1); } } |