summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-11-13 13:15:39 -0500
committerGlenn Morris <rgm@gnu.org>2018-11-13 13:15:39 -0500
commit5c0d8bb95bbd5354e6b2cd2e56a91afe4e780759 (patch)
treeb7ab493d579c39442b3aa497ca00ceb38894aa32 /lib-src
parent578c905ac758de41145a2e080da1e1c1c5c6b1ee (diff)
downloademacs-5c0d8bb95bbd5354e6b2cd2e56a91afe4e780759.tar.gz
emacs-5c0d8bb95bbd5354e6b2cd2e56a91afe4e780759.tar.bz2
emacs-5c0d8bb95bbd5354e6b2cd2e56a91afe4e780759.zip
Root emacsclient no longer connects to non-root sockets
* lib-src/emacsclient.c (set_local_socket): Don't ignore socket ownership when run by root. Ref: http://lists.gnu.org/r/emacs-devel/2018-11/msg00019.html
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 42b8dd6227b..6fbc2300958 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1365,14 +1365,9 @@ set_local_socket (const char *local_socket_name)
switch (sock_status)
{
case 1:
- /* There's a socket, but it isn't owned by us. This is OK if
- we are root. */
- if (0 != geteuid ())
- {
- message (true, "%s: Invalid socket owner\n", progname);
- return INVALID_SOCKET;
- }
- break;
+ /* There's a socket, but it isn't owned by us. */
+ message (true, "%s: Invalid socket owner\n", progname);
+ return INVALID_SOCKET;
case 2:
/* `stat' failed */