# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1074981477 0
# Node ID 04e9ebd16fcd7af7fafe333fe25ef5cd8fee6b46
# Parent  58aa022ecd151a07659125e6fb25a921b01090de
(main): Restore errno from saved_errno,
so the error message comes from socket_status.

diff -r 58aa022ecd15 -r 04e9ebd16fcd lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Sat Jan 24 21:54:06 2004 +0000
+++ b/lib-src/emacsclient.c	Sat Jan 24 21:57:57 2004 +0000
@@ -388,12 +388,14 @@
 	   that init_editfns uses to set the global Vuser_full_name.  */
 
 	char *user_name = (char *) getenv ("LOGNAME");
+
 	if (!user_name)
 	  user_name = (char *) getenv ("USER");
 
 	if (user_name)
 	  {
 	    struct passwd *pw = getpwnam (user_name);
+
 	    if (pw && (pw->pw_uid != geteuid ()))
 	      {
 		/* We're running under su, apparently. */
@@ -412,6 +414,8 @@
 		sock_status = socket_status (server.sun_path);
 		saved_errno = errno;
 	      }
+	    else
+	      errno = saved_errno;
 	  }
       }