Ensure we ignore a hostname in Default Settings, if a perverse user

has set one up using regedit. It badly confuses Plink.

git-svn-id: svn://svn.tartarus.org/sgt/putty@1404 cda61777-01e9-0310-a592-d414129be87e

diff --git a/settings.c b/settings.c
index 267b46d..26c7744 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -296,7 +296,11 @@ void load_settings(char *section, int do_host, Config * cfg)
     cfg->remote_cmd_ptr = cfg->remote_cmd;
     cfg->remote_cmd_ptr2 = NULL;
 
-    gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
+    if (do_host) {
+       gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
+    } else {
+       cfg->host[0] = '\0';           /* blank hostname */
+    }
     gpps(sesskey, "LogFileName", "putty.log",
         cfg->logfilename, sizeof(cfg->logfilename));
     gppi(sesskey, "LogType", 0, &cfg->logtype);