X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3608528b1152168da3032e8df4023df45b87299f..05bea829b8868f5db4ac048897e944ed05dfc457:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index ee446ece..146fcb30 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -73,8 +73,6 @@ static Config cfg;
  */
 char *platform_default_s(const char *name)
 {
-    if (!strcmp(name, "X11Display"))
-	return dupstr(getenv("DISPLAY"));
     if (!strcmp(name, "TermType"))
 	return dupstr(getenv("TERM"));
     if (!strcmp(name, "UserName"))
@@ -471,7 +469,7 @@ int main(int argc, char **argv)
 
     /* See if host is of the form user@host */
     if (cfg.host[0] != '\0') {
-	char *atsign = strchr(cfg.host, '@');
+	char *atsign = strrchr(cfg.host, '@');
 	/* Make sure we're not overflowing the user field */
 	if (atsign) {
 	    if (atsign - cfg.host < sizeof cfg.username) {