X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/5a9eb1056517b6ee6efa526a3a6b5a21aa802648..1d81a7b61a209e7ab114d4aadd4e9a8b318f83dc:/settings.c

diff --git a/settings.c b/settings.c
index b36affc2..d20c5bf4 100644
--- a/settings.c
+++ b/settings.c
@@ -20,7 +20,8 @@ static const struct keyval ciphernames[] = {
     { "des",	    CIPHER_DES }
 };
 
-static void gpps(void *handle, char *name, char *def, char *val, int len)
+static void gpps(void *handle, const char *name, const char *def,
+		 char *val, int len)
 {
     if (!read_setting_s(handle, name, val, len)) {
 	char *pdef;
@@ -126,13 +127,19 @@ static void wprefs(void *sesskey, char *name,
 
 void save_settings(char *section, int do_host, Config * cfg)
 {
-    int i;
-    char *p;
     void *sesskey;
 
     sesskey = open_settings_w(section);
     if (!sesskey)
 	return;
+    save_open_settings(sesskey, do_host, cfg);
+    close_settings_w(sesskey);
+}
+
+void save_open_settings(void *sesskey, int do_host, Config *cfg)
+{
+    int i;
+    char *p;
 
     write_setting_i(sesskey, "Present", 1);
     if (do_host) {
@@ -292,6 +299,7 @@ void save_settings(char *section, int do_host, Config * cfg)
     write_setting_i(sesskey, "BlinkText", cfg->blinktext);
     write_setting_i(sesskey, "X11Forward", cfg->x11_forward);
     write_setting_s(sesskey, "X11Display", cfg->x11_display);
+    write_setting_i(sesskey, "X11AuthType", cfg->x11_auth);
     write_setting_i(sesskey, "LocalPortAcceptAll", cfg->lport_acceptall);
     write_setting_i(sesskey, "RemotePortAcceptAll", cfg->rport_acceptall);
     {
@@ -325,7 +333,6 @@ void save_settings(char *section, int do_host, Config * cfg)
     write_setting_i(sesskey, "ScrollbarOnLeft", cfg->scrollbar_on_left);
     write_setting_s(sesskey, "BoldFont", cfg->boldfont);
     write_setting_i(sesskey, "ShadowBoldOffset", cfg->shadowboldoffset);
-    close_settings_w(sesskey);
 }
 
 void load_settings(char *section, int do_host, Config * cfg)
@@ -517,7 +524,7 @@ void load_open_settings(void *sesskey, int do_host, Config *cfg)
     gppi(sesskey, "TryPalette", 0, &cfg->try_palette);
     gppi(sesskey, "BoldAsColour", 1, &cfg->bold_colour);
     for (i = 0; i < 22; i++) {
-	static char *defaults[] = {
+	static const char *const defaults[] = {
 	    "187,187,187", "255,255,255", "0,0,0", "85,85,85", "0,0,0",
 	    "0,255,0", "0,0,0", "85,85,85", "187,0,0", "255,85,85",
 	    "0,187,0", "85,255,85", "187,187,0", "255,255,85", "0,0,187",
@@ -540,7 +547,7 @@ void load_open_settings(void *sesskey, int do_host, Config *cfg)
     gppi(sesskey, "RectSelect", 0, &cfg->rect_select);
     gppi(sesskey, "MouseOverride", 1, &cfg->mouse_override);
     for (i = 0; i < 256; i += 32) {
-	static char *defaults[] = {
+	static const char *const defaults[] = {
 	    "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
 	    "0,1,2,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1",
 	    "1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2",
@@ -582,6 +589,7 @@ void load_open_settings(void *sesskey, int do_host, Config *cfg)
     gppi(sesskey, "X11Forward", 0, &cfg->x11_forward);
     gpps(sesskey, "X11Display", "localhost:0", cfg->x11_display,
 	 sizeof(cfg->x11_display));
+    gppi(sesskey, "X11AuthType", X11_MIT, &cfg->x11_auth);
 
     gppi(sesskey, "LocalPortAcceptAll", 0, &cfg->lport_acceptall);
     gppi(sesskey, "RemotePortAcceptAll", 0, &cfg->rport_acceptall);