diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-01-05 05:58:50 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-01-05 05:58:50 +0000 |
| commit | 0221d2bfcbc9a3571fdbfbf3d8ad464aae4ffd24 (patch) | |
| tree | 7a66b701aaab5c7f676880174d5a2d4720871f87 /lib-src | |
| parent | 428a555ec5d5736a3eede739e9b42bd9d33b4364 (diff) | |
| parent | 17b337762fe7df77aa8a6dfcea0109a267bea83d (diff) | |
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-17
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-18
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-45
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
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; |