From e91bbfeeb530e1cedae85d53dd3d1c88815da185 Mon Sep 17 00:00:00 2001
From: cyd01 <cyrildupont71@gmail.com>
Date: Fri, 31 Dec 2021 14:47:19 +0100
Subject: [PATCH] Tagging the 0.76.0.4 release of the KiTTY project.

---
 0.76_My_PuTTY/pageant.c                 | 21 ++++++++++++++++----
 0.76_My_PuTTY/version.h                 |  2 +-
 0.76_My_PuTTY/windows/version_minor.txt |  2 +-
 0.76_My_PuTTY/windows/window.c          | 26 +++++++++++++++----------
 docs/version.txt                        |  2 +-
 5 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/0.76_My_PuTTY/pageant.c b/0.76_My_PuTTY/pageant.c
index b8b5c1b..f685ce6 100644
--- a/0.76_My_PuTTY/pageant.c
+++ b/0.76_My_PuTTY/pageant.c
@@ -912,11 +912,24 @@ static PageantAsyncOp *pageant_make_op(
 	char* confirm_fingerprint;
 	confirm_fingerprint = ssh2_fingerprint_blob(keyblob, SSH_FPTYPE_DEFAULT);
 	if( confirm_fingerprint!=NULL ) {
-		if (! confirm_key_usage( confirm_fingerprint, pk->rkey->comment)) {
-			sfree(confirm_fingerprint);
-			return NULL;
+		if( pk->rkey->comment != NULL ) {
+			if (! confirm_key_usage( confirm_fingerprint, pk->rkey->comment)) {
+				if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint);
+				fail("unconfirmed key");
+				pk=NULL;
+				goto responded;
+				//return NULL;
+			}
+		} else if( pk->comment != NULL ) {
+			if (! confirm_key_usage( confirm_fingerprint, pk->comment)) {
+				if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint);
+				fail("unconfirmed key");
+				pk=NULL;
+				goto responded;
+				//return NULL;
+			}
 		}
-		sfree(confirm_fingerprint);
+		if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint);
 	}
 #endif
 	
diff --git a/0.76_My_PuTTY/version.h b/0.76_My_PuTTY/version.h
index 6cb9c9f..9832501 100644
--- a/0.76_My_PuTTY/version.h
+++ b/0.76_My_PuTTY/version.h
@@ -1,5 +1,5 @@
 #define RELEASE 0.76
 #define TEXTVER "Release 0.76"
 #define SSHVER "-Release-0.76"
-#define BINARY_VERSION 0,76,0,3
+#define BINARY_VERSION 0,76,0,4
 #define SOURCE_COMMIT "unavailable"
diff --git a/0.76_My_PuTTY/windows/version_minor.txt b/0.76_My_PuTTY/windows/version_minor.txt
index 00750ed..b8626c4 100644
--- a/0.76_My_PuTTY/windows/version_minor.txt
+++ b/0.76_My_PuTTY/windows/version_minor.txt
@@ -1 +1 @@
-3
+4
diff --git a/0.76_My_PuTTY/windows/window.c b/0.76_My_PuTTY/windows/window.c
index 9a9a8cb..15a9780 100644
--- a/0.76_My_PuTTY/windows/window.c
+++ b/0.76_My_PuTTY/windows/window.c
@@ -7465,15 +7465,6 @@ if( !get_param("PUTTY") && conf_get_int(conf, CONF_disablealtgr) ) {
 }
 
 #ifdef MOD_PERSO
-
-void set_title_internal(TermWin *tw, const char *title) {
-    sfree(window_name);
-    window_name = snewn(1 + strlen(title), char);
-    strcpy(window_name, title);
-    if (conf_get_bool(conf, CONF_win_name_always) || !IsIconic(wgs.term_hwnd))
-	SetWindowText(wgs.term_hwnd, title);
-}
-
 /* Creer un titre de fenetre a partir d'un schema donne
 	%%f: le folder auquel apprtient le session
 	%%h: le hostname
@@ -7495,7 +7486,14 @@ void make_title( char * res, char * fmt, const char * title ) {
 	sprintf( res, fmt, title ) ;
 
 	while( (p=poss( "%%s", res)) > 0 ) { del(res,p,3); if(strlen(conf_get_str(conf,CONF_sessionname))>0) insert(res,conf_get_str(conf,CONF_sessionname),p); }
-	while( (p=poss( "%%h", res)) > 0 ) { del(res,p,3); insert(res,conf_get_str(conf,CONF_host),p); }
+	while( (p=poss( "%%h", res)) > 0 ) { 
+		del(res,p,3);
+		if( conf_get_int(conf,CONF_protocol) == PROT_SERIAL ) {
+			insert(res,conf_get_str(conf,CONF_serline),p);
+		} else {
+			insert(res,conf_get_str(conf,CONF_host),p);
+		}
+	}
 	while( (p=poss( "%%u", res)) > 0 ) { del(res,p,3); insert(res,conf_get_str(conf,CONF_username),p); }
 	while( (p=poss( "%%f", res)) > 0 ) { del(res,p,3); if(strlen(conf_get_str(conf,CONF_folder))>0) insert(res,conf_get_str(conf,CONF_folder),p); }
 	
@@ -7559,6 +7557,14 @@ void make_title( char * res, char * fmt, const char * title ) {
 	}
 }
 
+
+void set_title_internal(TermWin *tw, const char *title) {
+    sfree(window_name);
+    window_name = dupstr(title);
+    if (conf_get_bool(conf, CONF_win_name_always) || !IsIconic(wgs.term_hwnd))
+        SetWindowText(wgs.term_hwnd, title);
+}
+
 static void wintw_set_title(TermWin *tw, const char *title_in) {
 	char *buffer, fmt[256]="%s" ;
 	char *title ;
diff --git a/docs/version.txt b/docs/version.txt
index 164d8cd..fff8884 100644
--- a/docs/version.txt
+++ b/docs/version.txt
@@ -1 +1 @@
-0.76.0.3
\ No newline at end of file
+0.76.0.4
\ No newline at end of file