X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a4451dd11df30dc2d0d262dd6c36642aa2a02b91..881da16842e210236b12a040a19bf480de3a5a92:/config.c

diff --git a/config.c b/config.c
index 1fedd284..4f01c160 100644
--- a/config.c
+++ b/config.c
@@ -1049,7 +1049,9 @@ static void portfwd_handler(union control *ctrl, void *dlg,
 		{
 		    static const char *const afs = "A46";
 		    char *afp = strchr(afs, *p);
+#ifndef NO_IPV6
 		    int idx = afp ? afp-afs : 0;
+#endif
 		    if (afp)
 			p++;
 #ifndef NO_IPV6
@@ -1310,6 +1312,9 @@ void setup_config_box(struct controlbox *b, int midsession,
     ctrl_checkbox(s, "Implicit CR in every LF", 'r',
 		  HELPCTX(terminal_lfhascr),
 		  dlg_stdcheckbox_handler, I(offsetof(Config,lfhascr)));
+    ctrl_checkbox(s, "Implicit LF in every CR", 'f',
+		  HELPCTX(terminal_crhaslf),
+		  dlg_stdcheckbox_handler, I(offsetof(Config,crhaslf)));
     ctrl_checkbox(s, "Use background colour to erase screen", 'e',
 		  HELPCTX(terminal_bce),
 		  dlg_stdcheckbox_handler, I(offsetof(Config,bce)));
@@ -1716,6 +1721,14 @@ void setup_config_box(struct controlbox *b, int midsession,
 			  "IPv6", '6', I(ADDRTYPE_IPV6),
 			  NULL);
 #endif
+
+	    s = ctrl_getset(b, "Connection", "identity",
+			    "Logical name of remote host");
+	    ctrl_editbox(s, "Logical name of remote host (e.g. for SSH key lookup):",
+			 'm', 100,
+			 HELPCTX(connection_loghost),
+			 dlg_stdeditbox_handler, I(offsetof(Config,loghost)),
+			 I(sizeof(((Config *)0)->loghost)));
 	}
 
 	/*
@@ -2240,6 +2253,9 @@ void setup_config_box(struct controlbox *b, int midsession,
 	    ctrl_droplist(s, "Handles SSH-2 key re-exchange badly", 'k', 20,
 			  HELPCTX(ssh_bugs_rekey2),
 			  sshbug_handler, I(offsetof(Config,sshbug_rekey2)));
+	    ctrl_droplist(s, "Ignores SSH-2 maximum packet size", 'x', 20,
+			  HELPCTX(ssh_bugs_maxpkt2),
+			  sshbug_handler, I(offsetof(Config,sshbug_maxpkt2)));
 	}
     }
 }