(main): Restore errno from saved_errno,

so the error message comes from socket_status.

1 files changed, 4 insertions, 0 deletions

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 49ebada768..3ae33f72a1 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -388,12 +388,14 @@ main (argc, argv)
 	   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 @@ main (argc, argv)
 		sock_status = socket_status (server.sun_path);
 		saved_errno = errno;
 	      }
+	    else
+	      errno = saved_errno;
 	  }
       }