*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 7d9d689e585da2ea18f3dec12c72fba6e7318753..cd7f69ea659fa4cf76636194f4853b655a7293ba 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -5451,6 +5451,11 @@ Use M-x dsssl-mode.
 
 ** Changes to the emacsclient program
 
+*** If a socket can't be found, and environment variables LOGNAME or
+USER are set, emacsclient now looks for a socket based on the UID
+associated with the name.  That is an emacsclient running as root
+can connect to an Emacs server started by a non-root user.
+
 *** The emacsclient program now accepts an option --no-wait which tells
 it to return immediately without waiting for you to "finish" the
 buffer in Emacs.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5cb146bfb65b5f29eee6d1ee203cee63d27a97ea..42086351111e1b78193e72eef8825beef3af8330 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-28  Eric Hanchrow <offby1@blarg.net>
+
+       * emacsclient.c (socket_status): New function.
+       (main): if $LOGNAME or $USER exist and differ from our euid, look
+       for a socket based on the UID associated with the name.
+
 2000-01-12  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * emacsclient.c: Add option -a EDITOR and environment variable