(main): Fix socket name when using another user.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 542761fda2fc920b6c3358a7f50d88e30950370f..0e6a568db4961f7c8a74695cad715d21ed514bcd 100644 (file)
--- 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 aafc531ac5b2214e3eb0fd0bdbbe819b651f6f14..8ac1902929e37966b9b5ff2f09c85a9e9d47174d 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -391,7 +391,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);
              }