2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 542761fda2f..0e6a568db49 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-04  Andreas Schwab  <schwab@suse.de>
+
+        * emacsclient.c (main): Fix socket name when using another user.
+
 2003-12-27  Paul Eggert  <eggert@twinsun.com>
 
         * rcs2log (rlog_options): Append -rbranchtag if CVS/Tag indicates
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index f45ca56c0d3..d737b2a11eb 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -470,7 +470,7 @@ main (argc, argv)
             if (pw && (pw->pw_uid != geteuid ()))
               {
                 /* We're running under su, apparently. */
-                sprintf (server.sun_path, "/tmp/esrv%d-%s",
+                sprintf (server.sun_path, "/tmp/emacs%d-%s/server",
                          (int) pw->pw_uid, system_name);
                 sock_status = socket_status (server.sun_path);
                 oerrno = errno;